diff --git a/framework/ipc/test/org/apache/cloudstack/framework/codestyle/ClientOnlyEventDrivenStyle.java b/framework/ipc/test/org/apache/cloudstack/framework/codestyle/ClientOnlyEventDrivenStyle.java
deleted file mode 100644
index 2ea7c7c3dc1..00000000000
--- a/framework/ipc/test/org/apache/cloudstack/framework/codestyle/ClientOnlyEventDrivenStyle.java
+++ /dev/null
@@ -1,58 +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 org.apache.cloudstack.framework.codestyle;
-
-import org.apache.cloudstack.framework.rpc.RpcCallbackDispatcher;
-import org.apache.cloudstack.framework.rpc.RpcClientCall;
-import org.apache.cloudstack.framework.rpc.RpcException;
-import org.apache.cloudstack.framework.rpc.RpcIOException;
-import org.apache.cloudstack.framework.rpc.RpcProvider;
-import org.apache.cloudstack.framework.rpc.RpcTimeoutException;
-
-public class ClientOnlyEventDrivenStyle {
-    RpcProvider _rpcProvider;
-
-    public void AsyncCallRpcService() {
-        String cmd = new String();
-        RpcCallbackDispatcher<ClientOnlyEventDrivenStyle> callbackDispatcher = RpcCallbackDispatcher.create(this);
-        callbackDispatcher.setCallback(callbackDispatcher.getTarget().OnAsyncCallRpcServiceCallback(null, null));
-        _rpcProvider.newCall("host-2")
-            .setCommand("TestCommand")
-            .setCommandArg(cmd)
-            .setTimeout(10000)
-            .setCallbackDispatcher(callbackDispatcher)
-            .setContext("Context Object")
-            // save context object for callback handler
-            .apply();
-    }
-
-    public Void OnAsyncCallRpcServiceCallback(RpcClientCall call, String context) {
-        try {
-            String answer = call.get();
-
-        } catch (RpcTimeoutException e) {
-
-        } catch (RpcIOException e) {
-
-        } catch (RpcException e) {
-        }
-
-        return null;
-    }
-}
diff --git a/framework/ipc/test/org/apache/cloudstack/framework/codestyle/ClientOnlyListenerStyle.java b/framework/ipc/test/org/apache/cloudstack/framework/codestyle/ClientOnlyListenerStyle.java
deleted file mode 100644
index 1e2df201ddf..00000000000
--- a/framework/ipc/test/org/apache/cloudstack/framework/codestyle/ClientOnlyListenerStyle.java
+++ /dev/null
@@ -1,58 +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 org.apache.cloudstack.framework.codestyle;
-
-import org.apache.cloudstack.framework.rpc.RpcCallbackListener;
-import org.apache.cloudstack.framework.rpc.RpcClientCall;
-import org.apache.cloudstack.framework.rpc.RpcException;
-import org.apache.cloudstack.framework.rpc.RpcIOException;
-import org.apache.cloudstack.framework.rpc.RpcProvider;
-import org.apache.cloudstack.framework.rpc.RpcTimeoutException;
-
-public class ClientOnlyListenerStyle {
-
-    RpcProvider _rpcProvider;
-
-    public void AsyncCallRpcService() {
-        String cmd = new String();
-        _rpcProvider.newCall("host-2").setCommand("TestCommand").setCommandArg(cmd).setTimeout(10000).addCallbackListener(new RpcCallbackListener<String>() {
-            @Override
-            public void onSuccess(String result) {
-            }
-
-            @Override
-            public void onFailure(RpcException e) {
-            }
-        }).apply();
-    }
-
-    public void SyncCallRpcService() {
-        String cmd = new String();
-        RpcClientCall call = _rpcProvider.newCall("host-2").setCommand("TestCommand").setCommandArg(cmd).setTimeout(10000).apply();
-
-        try {
-            String answer = call.get();
-        } catch (RpcTimeoutException e) {
-
-        } catch (RpcIOException e) {
-
-        } catch (RpcException e) {
-        }
-    }
-}