diff --git a/web/api/app/Console/Command/Task/empty b/web/api/app/Console/Command/Task/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/app/Console/Templates/empty b/web/api/app/Console/Templates/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/app/Controller/Component/empty b/web/api/app/Controller/Component/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/app/Lib/empty b/web/api/app/Lib/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/app/Locale/eng/LC_MESSAGES/empty b/web/api/app/Locale/eng/LC_MESSAGES/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/app/Model/Behavior/empty b/web/api/app/Model/Behavior/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/app/Model/Datasource/empty b/web/api/app/Model/Datasource/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/app/Plugin/empty b/web/api/app/Plugin/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/app/Test/Case/Controller/Component/empty b/web/api/app/Test/Case/Controller/Component/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/app/Test/Case/Model/Behavior/empty b/web/api/app/Test/Case/Model/Behavior/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/app/Test/Case/View/Helper/empty b/web/api/app/Test/Case/View/Helper/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/app/Test/Fixture/empty b/web/api/app/Test/Fixture/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/app/Vendor/empty b/web/api/app/Vendor/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/app/View/Elements/empty b/web/api/app/View/Elements/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/app/View/Scaffolds/empty b/web/api/app/View/Scaffolds/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/app/View/View/Elements/empty b/web/api/app/View/View/Elements/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/app/View/View/Scaffolds/empty b/web/api/app/View/View/Scaffolds/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/app/webroot/files/empty b/web/api/app/webroot/files/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/app/webroot/js/empty b/web/api/app/webroot/js/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/lib/Cake/Console/Templates/skel/Console/Command/Task/empty b/web/api/lib/Cake/Console/Templates/skel/Console/Command/Task/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/lib/Cake/Console/Templates/skel/Console/Templates/empty b/web/api/lib/Cake/Console/Templates/skel/Console/Templates/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/lib/Cake/Console/Templates/skel/Controller/Component/empty b/web/api/lib/Cake/Console/Templates/skel/Controller/Component/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/lib/Cake/Console/Templates/skel/Lib/empty b/web/api/lib/Cake/Console/Templates/skel/Lib/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/lib/Cake/Console/Templates/skel/Locale/eng/LC_MESSAGES/empty b/web/api/lib/Cake/Console/Templates/skel/Locale/eng/LC_MESSAGES/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/lib/Cake/Console/Templates/skel/Model/Behavior/empty b/web/api/lib/Cake/Console/Templates/skel/Model/Behavior/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/lib/Cake/Console/Templates/skel/Model/Datasource/empty b/web/api/lib/Cake/Console/Templates/skel/Model/Datasource/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/lib/Cake/Console/Templates/skel/Plugin/empty b/web/api/lib/Cake/Console/Templates/skel/Plugin/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/lib/Cake/Console/Templates/skel/Test/Case/Controller/Component/empty b/web/api/lib/Cake/Console/Templates/skel/Test/Case/Controller/Component/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/lib/Cake/Console/Templates/skel/Test/Case/Model/Behavior/empty b/web/api/lib/Cake/Console/Templates/skel/Test/Case/Model/Behavior/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/lib/Cake/Console/Templates/skel/Test/Case/View/Helper/empty b/web/api/lib/Cake/Console/Templates/skel/Test/Case/View/Helper/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/lib/Cake/Console/Templates/skel/Test/Fixture/empty b/web/api/lib/Cake/Console/Templates/skel/Test/Fixture/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/lib/Cake/Console/Templates/skel/Vendor/empty b/web/api/lib/Cake/Console/Templates/skel/Vendor/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/lib/Cake/Console/Templates/skel/View/Elements/empty b/web/api/lib/Cake/Console/Templates/skel/View/Elements/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/lib/Cake/Console/Templates/skel/View/Scaffolds/empty b/web/api/lib/Cake/Console/Templates/skel/View/Scaffolds/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/lib/Cake/Console/Templates/skel/webroot/files/empty b/web/api/lib/Cake/Console/Templates/skel/webroot/files/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/lib/Cake/Console/Templates/skel/webroot/js/empty b/web/api/lib/Cake/Console/Templates/skel/webroot/js/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/lib/Cake/Test/test_app/Console/Command/Task/empty b/web/api/lib/Cake/Test/test_app/Console/Command/Task/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/lib/Cake/Test/test_app/Controller/Component/empty b/web/api/lib/Cake/Test/test_app/Controller/Component/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Templates/empty b/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Templates/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/Task/empty b/web/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/Task/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Templates/empty b/web/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Templates/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/lib/Cake/Test/test_app/View/Scaffolds/empty b/web/api/lib/Cake/Test/test_app/View/Scaffolds/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/api/lib/Cake/Test/test_app/tmp/empty b/web/api/lib/Cake/Test/test_app/tmp/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/index.php b/web/index.php
index d639b1ae4..73993f527 100644
--- a/web/index.php
+++ b/web/index.php
@@ -109,7 +109,6 @@ define( "ZM_SKIN_PATH", "skins/$skin" );
 $skinBase = array(); // To allow for inheritance of skins
 if ( !file_exists( ZM_SKIN_PATH ) )
     Fatal( "Invalid skin '$skin'" );
-require_once( ZM_SKIN_PATH.'/includes/init.php' );
 $skinBase[] = $skin;
 
 ini_set( "session.name", "ZMSESSID" );
diff --git a/web/skins/classic/includes/init.php b/web/skins/classic/includes/init.php
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/skins/classic/views/js/plugin.js.php b/web/skins/classic/views/js/plugin.js.php
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/skins/classic/views/nph-zms b/web/skins/classic/views/nph-zms
deleted file mode 100644
index e69de29bb..000000000