diff --git a/etcd/AsyncDeleteResponse.h b/etcd/AsyncDeleteResponse.h
deleted file mode 100644
index 3c7c6c2..0000000
--- a/etcd/AsyncDeleteResponse.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * AsyncDeleteResponse.h
- *
- *  Created on: Jun 7, 2016
- *      Author: ubuntu
- */
-
-#ifndef SRC_ASYNCDELETERESPONSE_H_
-#define SRC_ASYNCDELETERESPONSE_H_
-
-#include "etcd/BaseResponse.h"
-
-namespace etcd {
-class AsyncDeleteResponse : public etcd::BaseResponse {
-public:
-	AsyncDeleteResponse();
-	virtual ~AsyncDeleteResponse();
-
-	void fillUpV2ResponseValues(etcdserverpb::RangeResponse);
-	etcdserverpb::DeleteRangeResponse deleteResponse;
-
-	std::unique_ptr<grpc::ClientAsyncResponseReader<etcdserverpb::DeleteRangeResponse>> rpcInstance;
-
-};
-}
-#endif /* SRC_ASYNCDELETERESPONSE_H_ */
diff --git a/etcd/BaseResponse.h b/etcd/BaseResponse.h
deleted file mode 100644
index b4751b1..0000000
--- a/etcd/BaseResponse.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * BaseResponse.h
- *
- *  Created on: Jun 7, 2016
- *      Author: ubuntu
- */
-
-#ifndef SRC_BASERESPONSE_H_
-#define SRC_BASERESPONSE_H_
-
-#include "etcd/Response.hpp"
-#include "proto/rpc.grpc.pb.h"
-
-namespace etcd {
-class BaseResponse : public etcd::Response {
-public:
-	//TODO: turn into a abstract class
-	BaseResponse();
-	virtual ~BaseResponse();
-
-	grpc::Status status;
-	grpc::ClientContext context;
-	grpc::CompletionQueue cq_;
-};
-}
-#endif /* SRC_BASERESPONSE_H_ */
diff --git a/src/AsyncDeleteResponse.cpp b/src/AsyncDeleteResponse.cpp
deleted file mode 100644
index 6e65e73..0000000
--- a/src/AsyncDeleteResponse.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * AsyncDeleteResponse.cpp
- *
- *  Created on: Jun 7, 2016
- *      Author: ubuntu
- */
-
-#include "etcd/AsyncDeleteResponse.h"
-
-etcd::AsyncDeleteResponse::AsyncDeleteResponse() {
-	// TODO Auto-generated constructor stub
-}
-
-etcd::AsyncDeleteResponse::~AsyncDeleteResponse() {
-	// TODO Auto-generated destructor stub
-}
-
-void etcd::AsyncDeleteResponse::fillUpV2ResponseValues(etcdserverpb::RangeResponse getResponse) {
-	_prev_value.value = getResponse.kvs().Get(0).value();
-	_action = "delete";
-
-}
diff --git a/src/BaseResponse.cpp b/src/BaseResponse.cpp
deleted file mode 100644
index d0ed8ba..0000000
--- a/src/BaseResponse.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * BaseResponse.cpp
- *
- *  Created on: Jun 7, 2016
- *      Author: ubuntu
- */
-
-#include "etcd/BaseResponse.h"
-
-etcd::BaseResponse::BaseResponse() {
-	// TODO Auto-generated constructor stub
-}
-
-etcd::BaseResponse::~BaseResponse() {
-	// TODO Auto-generated destructor stub
-}
-
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 916ab07..3572fef 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(etcd-cpp-api SHARED ../proto/kv.pb.cc ../proto/auth.pb.cc ../proto/rpc.pb.cc ../proto/rpc.grpc.pb.cc ../v3/src/Utils.cpp ../v3/src/grpcClient.cpp ../v3/src/AsyncRangeResponse.cpp ../v3/src/AsyncPutResponse.cpp ../v3/src/V3BaseResponse.cpp ../v3/src/AsyncDelResponse.cpp ../v3/src/AsyncModifyResponse.cpp Client.cpp Response.cpp Value.cpp json_constants.cpp BaseResponse.cpp AsyncDeleteResponse.cpp)
+add_library(etcd-cpp-api SHARED ../proto/kv.pb.cc ../proto/auth.pb.cc ../proto/rpc.pb.cc ../proto/rpc.grpc.pb.cc ../v3/src/Utils.cpp ../v3/src/grpcClient.cpp ../v3/src/AsyncRangeResponse.cpp ../v3/src/AsyncPutResponse.cpp ../v3/src/V3BaseResponse.cpp ../v3/src/AsyncDelResponse.cpp ../v3/src/AsyncModifyResponse.cpp Client.cpp Response.cpp Value.cpp json_constants.cpp)
 set_property(TARGET etcd-cpp-api PROPERTY CXX_STANDARD 11)
 
 target_link_libraries(etcd-cpp-api ${CPPREST_LIB} boost_system ssl crypto protobuf grpc++)