diff --git a/README b/README
deleted file mode 100644
index 1e6bf2f..0000000
--- a/README
+++ /dev/null
@@ -1,151 +0,0 @@
-wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
-add-apt-repository http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3
-apt update
-apt install -y salt-master salt-minion reclass make
-
-rm /etc/salt/minion_id
-rm -f /etc/salt/pki/minion/minion_master.pub
-echo "id: all01.local" > /etc/salt/minion
-echo "master: localhost" >> /etc/salt/minion
-
-[ ! -d /etc/salt/master.d ] && mkdir -p /etc/salt/master.d
-cat <<-EOF > /etc/salt/master.d/master.conf
-file_roots:
-  base:
-  - /usr/share/salt-formulas/env
-pillar_opts: False
-open_mode: True
-reclass: &reclass
-  storage_type: yaml_fs
-  inventory_base_uri: /srv/salt/reclass
-ext_pillar:
-  - reclass: *reclass
-master_tops:
-  reclass: *reclass
-EOF
-
-[ ! -d /etc/reclass ] && mkdir /etc/reclass
-cat <<-EOF > /etc/reclass/reclass-config.yml
-storage_type: yaml_fs
-pretty_print: True
-output: yaml
-inventory_base_uri: /srv/salt/reclass
-EOF
-
-service salt-master restart
-service salt-minion restart
-
-git clone https://gerrit.mcp.mirantis.net/p/salt-models/mcp-virtual-aio.git /srv/salt/reclass
-cd /srv/salt/reclass
-git clone https://gerrit.mcp.mirantis.net/p/salt-models/reclass-system.git classes/system
-ln -s /usr/share/salt-formulas/reclass/service classes/service
-
-export FORMULAS_BASE=https://gerrit.mcp.mirantis.net/salt-formulas
-export FORMULAS_PATH=/root/formulas
-export FORMULAS_BRANCH=master
-
-mkdir -p ${FORMULAS_PATH}
-declare -a formula_services=("linux" "reclass" "salt" "openssh" "ntp" "git" "nginx" "collectd" "sensu" "heka" "sphinx" "mysql" "grafana" "libvirt" "rsyslog" "memcached" "rabbitmq" "apache" "keystone" "glance" "nova" "neutron" "cinder" "heat" "horizon" "ironic" "tftpd-hpa" "bind" "powerdns" "designate")
-for formula_service in "${formula_services[@]}"; do
-  _BRANCH=${FORMULAS_BRANCH}
-    [ ! -d "${FORMULAS_PATH}/${formula_service}" ] && {
-      if ! git ls-remote --exit-code --heads ${FORMULAS_BASE}/${formula_service}.git ${_BRANCH};then
-        # Fallback to the master branch if the branch doesn't exist for this repository
-        _BRANCH=master
-      fi
-      git clone ${FORMULAS_BASE}/${formula_service}.git ${FORMULAS_PATH}/${formula_service} -b ${_BRANCH}
-    } || {
-      cd ${FORMULAS_PATH}/${formula_service};
-      git fetch ${_BRANCH} || git fetch --all
-      git checkout ${_BRANCH} && git pull || git pull;
-      cd -
-  }
-  cd ${FORMULAS_PATH}/${formula_service}
-  make install
-  cd -
-done
-
-# In case Designate should be deployed with PowerDNS backend, change designate_backend.yml:
-cat <<-'EOF' > classes/cluster/designate_backend.yml
-classes:
-- system.designate.server.backend.pdns
-parameters:
-  _param:
-    designate_pool_target_type: pdns4
-    powerdns_webserver_password: gJ6n3gVaYP8eS
-    powerdns_webserver_port: 8081
-    designate_pdns_api_key: VxK9cMlFL5Ae
-    designate_pdns_api_endpoint: "http://${_param:single_address}:${_param:powerdns_webserver_port}"
-    designate_pool_target_options:
-      api_endpoint: ${_param:designate_pdns_api_endpoint}
-      api_token: ${_param:designate_pdns_api_key}
-  powerdns:
-    server:
-      axfr_ips:
-        - ${_param:single_address}
-EOF
-
-# Apply all
-salt-call state.apply # minimum two times or until success
-
-# or apply one by one (when fail on some step - repeat or ignore):
-#salt-call state.apply salt
-#salt-call state.apply linux,ntp,openssh
-#salt-call state.apply memcached
-#salt-call state.apply rabbitmq
-#salt-call state.apply mysql
-#salt-call state.apply keystone
-#salt-call state.apply glance
-#salt-call state.apply neutron
-#salt-call state.apply nova
-#salt-call state.apply cinder
-#salt-call state.apply heat
-#salt-call state.apply horizon
-
-#If Powerdns Designate backend:
-#salt-call state.apply powerdns
-
-#If Bind9 Designate backend:
-#salt-call state.apply bind
-
-#salt-call state.apply designate
-# Ironic is not available yet.
-#salt-call state.apply ironic
-#salt-call state.apply tftpd_hpa
-
-service apache2 restart
-
-. /root/keystonercv3
-
-wget http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img
-glance image-create --name cirros --visibility public --disk-format qcow2 --container-format bare --file cirros-0.3.5-x86_64-disk.img --progress
-
-neutron net-create internal_net
-neutron subnet-create --name internal_subnet internal_net 192.168.1.0/24
-
-neutron net-create external_network --provider:network_type flat --provider:physical_network physnet1 --router:external
-neutron subnet-create --name external_subnet --enable_dhcp=False --allocation-pool=start=172.16.1.2,end=172.16.1.250 --gateway=172.16.1.1 external_network 172.16.1.0/24
-
-neutron router-create r1
-neutron router-interface-add r1 internal_subnet
-neutron router-gateway-set r1 external_network
-
-nova secgroup-add-rule default icmp -1 -1 0.0.0.0/0
-nova secgroup-add-rule default tcp 1 65535 0.0.0.0/0
-
-nova flavor-create m1.extra_tiny auto 256 0 1
-
-nova boot --flavor m1.extra_tiny --image cirros --nic net-id=d23f9845-cbce-47a6-be15-0603f6a31365 test # UUID of internal network
-
-nova floating-ip-create external_network
-nova floating-ip-associate test 172.16.1.7 # floating IP
-
-cinder create --name test 1
-nova volume-attach test 49a471ec-2e6d-4810-9161-6c191e1370f5 # UUID of volume
-
-openstack dns service list
-openstack zone create --email dnsmaster@example.tld example.tld.
-openstack recordset create --records '10.0.0.1' --type A example.tld. www
-nslookup www.example.tld 127.0.0.1
-
-# Horizon is available on port :8078
diff --git a/classes/cluster/designate_backend.yml b/classes/cluster/designate_backend.yml
deleted file mode 100644
index e773c3d..0000000
--- a/classes/cluster/designate_backend.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-classes:
-- system.bind.server.single
-- system.designate.server.backend.bind
-parameters:
-  _param:
-    designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8H+z0fLLBunoitw==
-    designate_pool_target_type: bind9
-    designate_pool_target_options:
-      rndc_host: ${_param:single_address}
-      rndc_port: 953
-      rndc_key_file: /etc/designate/rndc.key
diff --git a/classes/cluster/virtual-mcp-allinone/init.yml b/classes/cluster/virtual-mcp-allinone/init.yml
deleted file mode 100755
index e0d42da..0000000
--- a/classes/cluster/virtual-mcp-allinone/init.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-classes:
-- system.linux.system.single
-- system.linux.storage.loopback
-- service.mysql.server.single
-- system.mysql.client
-- system.memcached.server.single
-- system.rabbitmq.server.single
-- cluster.virtual-mcp-allinone.openstack
-parameters:
-  _param:
-    mysql_admin_user: root
-    mysql_admin_password: workshop
-    rabbitmq_secret_key: workshop
-    rabbitmq_admin_password: workshop
-    loopback_device_size: 10
-  openssh:
-    server:
-      password_auth: true
-      permit_root_login: true
-  linux:
-    system:
-      user:
-        root:
-          enabled: true
-          # r00tme
-          password: $6$9ojWyyN.$26Vj46JtCUL6C7XBQ8RmQTZLwo8/8SkqTRElXh0X2YBLrt7E/aVe2AYQ5gguYUwUknZNOSn5q7M9M3Jyf2gof/
-    network:
-      bridge: openvswitch
-      interface:
-        br-floating:
-          enabled: true
-          type: ovs_bridge
-  mysql:
-    server:
-      version: '5.6'
-      max_connections: 20000
-# override on this level
-  nova:
-    compute:
-      cache:
-        members:
-        - host: 127.0.0.1
-          port: 11211
-  cinder:
-    volume:
-      cache:
-        members:
-        - host: 127.0.0.1
-          port: 11211
-  neutron:
-    server:
-      message_queue:
-        members:
-          - host: ${_param:single_address}
diff --git a/classes/cluster/virtual-mcp-allinone/openstack/init.yml b/classes/cluster/virtual-mcp-allinone/openstack/init.yml
deleted file mode 100755
index ba3e9e1..0000000
--- a/classes/cluster/virtual-mcp-allinone/openstack/init.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-classes:
-- system.linux.system.lowmem
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.rabbitmq.server.vhost.openstack
-- system.keystone.server.wsgi
-- system.keystone.server.single
-- system.mysql.client.database.keystone
-- system.mysql.client.database.glance
-- system.mysql.client.database.nova
-- system.mysql.client.database.nova_api
-- system.mysql.client.database.cinder
-- system.mysql.client.database.heat
-#- system.mysql.client.database.ironic
-- system.mysql.client.database.designate
-- system.mysql.client.database.designate_pool_manager
-- system.keystone.client.single
-- system.keystone.client.service.nova21
-- system.keystone.client.service.nova-placement
-#- system.keystone.client.service.ironic
-- system.keystone.client.service.designate
-- system.glance.control.single
-- system.nova.control.single
-- system.neutron.control.openvswitch.single
-- system.heat.server.single
-- system.nova.compute.single
-- service.neutron.gateway.single
-- system.cinder.control.single
-- system.cinder.control.backend.lvm
-- service.cinder.volume.single
-- system.cinder.volume.backend.lvm
-- system.horizon.server.single
-- system.designate.server.single
-#- system.ironic.api.single
-#- system.ironic.conductor.single
-#- system.ironic.tftpd_hpa
-#- system.ironic.apache
-- cluster.designate_backend
-parameters:
-  _param:
-    openstack_version: ocata
-    cluster_public_host: ${_param:single_address}
-    cluster_public_protocol: http
-    openstack_region: RegionOne
-    admin_email: root@localhost
-    rabbitmq_openstack_password: workshop
-    keystone_version: ${_param:openstack_version}
-    glance_version: ${_param:openstack_version}
-    nova_version: ${_param:openstack_version}
-    neutron_version: ${_param:openstack_version}
-    cinder_version: ${_param:openstack_version}
-    heat_version: ${_param:openstack_version}
-    horizon_version: ${_param:openstack_version}
-    ironic_version: ${_param:openstack_version}
-    designate_version: ${_param:openstack_version}
-    keystone_service_token: workshop
-    keystone_admin_password: workshop
-    keystone_ceilometer_password: workshop
-    keystone_cinder_password: workshop
-    keystone_glance_password: workshop
-    keystone_heat_password: workshop
-    keystone_neutron_password: workshop
-    keystone_nova_password: workshop
-    keystone_designate_password: workshop
-    keystone_ironic_password: workshop
-    keystone_service_host: ${_param:single_address}
-    mysql_keystone_password: workshop
-    mysql_glance_password: workshop
-    mysql_nova_password: workshop
-    mysql_neutron_password: workshop
-    mysql_cinder_password: workshop
-    mysql_heat_password: workshop
-    mysql_ironic_password: workshop
-    mysql_designate_password: workshop
-    heat_service_host: ${_param:single_address}
-    neutron_service_host: ${_param:single_address}
-    glance_service_host: ${_param:single_address}
-    cinder_service_host: ${_param:single_address}
-    designate_service_host: ${_param:single_address}
-    nova_service_host: ${_param:single_address}
-    ironic_service_host: ${_param:single_address}
-    control_address: ${_param:single_address}
-    metadata_password: workshop
-    cluster_vip_address: ${_param:single_address}
-    cluster_local_address: ${_param:single_address}
-    openstack_database_address: ${_param:single_address}
-    tenant_address: ${_param:single_address}
-    heat_domain_admin_password: workshop
-    horizon_secret_key: workshop
-    horizon_identity_encryption: none
-    horizon_identity_version: 2
-    designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
-    designate_pool_ns_records:
-      - hostname: 'ns1.example.org.'
-        priority: 10
-    designate_pool_nameservers:
-      - host: ${_param:single_address}
-        port: 53
-    designate_pool_target_masters:
-      - host: ${_param:single_address}
-        port: 5354
-    designate_pool_target_options:
-      host: ${_param:single_address}
-      port: 53
-  neutron:
-    server:
-      message_queue:
-        members: ~
-    gateway:
-      agent_mode: dvr_snat
-      dvr: True
-  nova:
-    compute:
-      network:
-        user: neutron
-        password: ${_param:keystone_neutron_password}
-        tenant: service
-      cache:
-        members: ~
-  cinder:
-    volume:
-      cache:
-        members: ~
-  horizon:
-    server:
-      secure: False
-  ironic:
-    conductor:
-      enabled_drivers:
-        - pxe_ipmitool