diff --git a/VERSION b/VERSION
index 40c341b..51dd6ab 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.6.0
+3.6.1-dev
diff --git a/agent/common/server.cc b/agent/common/server.cc
index 168df68..3199a51 100644
--- a/agent/common/server.cc
+++ b/agent/common/server.cc
@@ -260,32 +260,28 @@
             ServerContext* context,
             const tech_profile::TrafficSchedulers* request,
             openolt::Empty* response) override {
-        CreateTrafficSchedulers_(request);
-        return Status::OK;
+        return CreateTrafficSchedulers_(request);
     };
 
     Status RemoveTrafficSchedulers(
             ServerContext* context,
             const tech_profile::TrafficSchedulers* request,
             openolt::Empty* response) override {
-        RemoveTrafficSchedulers_(request);
-        return Status::OK;
+        return RemoveTrafficSchedulers_(request);
     };
 
     Status CreateTrafficQueues(
             ServerContext* context,
             const tech_profile::TrafficQueues* request,
             openolt::Empty* response) override {
-        CreateTrafficQueues_(request);
-        return Status::OK;
+        return CreateTrafficQueues_(request);
     };
 
     Status RemoveTrafficQueues(
             ServerContext* context,
             const tech_profile::TrafficQueues* request,
             openolt::Empty* response) override {
-        RemoveTrafficQueues_(request);
-        return Status::OK;
+        return RemoveTrafficQueues_(request);
     };
 
     Status PerformGroupOperation(