diff --git a/agent-simulator/tomcatconf/components-simulator.xml.in b/agent-simulator/tomcatconf/components-simulator.xml.in
deleted file mode 100755
index 1b7df46ad2b..00000000000
--- a/agent-simulator/tomcatconf/components-simulator.xml.in
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
-
-
diff --git a/plugins/hypervisors/simulator/resources/components-simulator.xml b/plugins/hypervisors/simulator/resources/components-simulator.xml
deleted file mode 100644
index 2658e4db3ee..00000000000
--- a/plugins/hypervisors/simulator/resources/components-simulator.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
index 356284c5d73..6ee9d608ff1 100644
--- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
+++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
@@ -193,28 +193,6 @@ public class MockVmManagerImpl extends ManagerBase implements MockVmManager {
return null;
}
- public boolean rebootVM(String vmName) {
- Transaction txn = Transaction.open(Transaction.SIMULATOR_DB);
- try {
- txn.start();
- MockVm vm = _mockVmDao.findByVmName(vmName);
- if (vm != null) {
- vm.setState(State.Running);
- _mockVmDao.update(vm.getId(), (MockVMVO) vm);
-
- }
- txn.commit();
- } catch (Exception ex) {
- txn.rollback();
- throw new CloudRuntimeException("unable to reboot vm " + vmName, ex);
- } finally {
- txn.close();
- txn = Transaction.open(Transaction.CLOUD_DB);
- txn.close();
- }
- return true;
- }
-
@Override
public Map getVms(String hostGuid) {
Transaction txn = Transaction.open(Transaction.SIMULATOR_DB);
diff --git a/plugins/hypervisors/simulator/src/com/cloud/configuration/SimulatorComponentLibrary.java b/plugins/hypervisors/simulator/src/com/cloud/configuration/SimulatorComponentLibrary.java
deleted file mode 100644
index 373cae1367e..00000000000
--- a/plugins/hypervisors/simulator/src/com/cloud/configuration/SimulatorComponentLibrary.java
+++ /dev/null
@@ -1,40 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.configuration;
-
-
-//TODO: Remove this class after the managers are figured out.
-public class SimulatorComponentLibrary {
-// @Override
-// protected void populateManagers() {
-// addManager("VM Manager", MockVmManagerImpl.class);
-// addManager("agent manager", MockAgentManagerImpl.class);
-// addManager("storage manager", MockStorageManagerImpl.class);
-// addManager("SimulatorManager", SimulatorManagerImpl.class);
-// }
-//
-// @Override
-// protected void populateDaos() {
-// addDao("mock Host", MockHostDaoImpl.class);
-// addDao("mock secondary storage", MockSecStorageDaoImpl.class);
-// addDao("mock storage pool", MockStoragePoolDaoImpl.class);
-// addDao("mock vm", MockVMDaoImpl.class);
-// addDao("mock volume", MockVolumeDaoImpl.class);
-// addDao("mock config", MockConfigurationDaoImpl.class);
-// addDao("mock security rules", MockSecurityRulesDaoImpl.class);
-// }
-}