diff --git a/usb/gadget/aidl/default/UsbGadget.cpp b/usb/gadget/aidl/default/UsbGadget.cpp
index 17e1da7..72cf681 100644
--- a/usb/gadget/aidl/default/UsbGadget.cpp
+++ b/usb/gadget/aidl/default/UsbGadget.cpp
@@ -146,7 +146,9 @@
 Status UsbGadget::setupFunctions(long functions, const shared_ptr<IUsbGadgetCallback>& callback,
                                  uint64_t timeout, int64_t in_transactionId) {
     bool ffsEnabled = false;
-    ALOGI("functions: %ld, timeout: %ld", functions, timeout);
+    if (timeout == 0) {
+        ALOGI("timeout not setup");
+    }
 
     if ((functions & GadgetFunction::ADB) != 0) {
         ffsEnabled = true;
@@ -190,16 +192,15 @@
     return Status::ERROR;
 }
 
-ScopedAStatus UsbGadget::setCurrentUsbFunctions(long functions,
+ScopedAStatus UsbGadget::setCurrentUsbFunctions(int64_t functions,
                                                 const shared_ptr<IUsbGadgetCallback>& callback,
-                                                int64_t timeout, int64_t in_transactionId) {
+                                                int64_t timeoutMs, int64_t in_transactionId) {
     std::unique_lock<std::mutex> lk(mLockSetCurrentFunction);
     std::string current_usb_power_operation_mode, current_usb_type;
     std::string usb_limit_sink_enable;
 
     string accessoryCurrentLimitEnablePath, accessoryCurrentLimitPath, path;
 
-    ALOGI("enter setCurrentUsbFunctions, in_transactionId=%ld , %ld", in_transactionId, timeout);
     mCurrentUsbFunctions = functions;
     mCurrentUsbFunctionsApplied = false;
 
@@ -232,7 +233,7 @@
                 -1, "Error while calling setCurrentUsbFunctionsCb");
     }
 
-    status = setupFunctions(functions, callback, timeout, in_transactionId);
+    status = setupFunctions(functions, callback, timeoutMs, in_transactionId);
     if (status != Status::SUCCESS) {
         goto error;
     }
diff --git a/usb/gadget/aidl/default/UsbGadget.h b/usb/gadget/aidl/default/UsbGadget.h
index 4060021..5060194 100644
--- a/usb/gadget/aidl/default/UsbGadget.h
+++ b/usb/gadget/aidl/default/UsbGadget.h
@@ -89,9 +89,9 @@
     bool mCurrentUsbFunctionsApplied;
     UsbSpeed mUsbSpeed;
 
-    ScopedAStatus setCurrentUsbFunctions(long functions,
+    ScopedAStatus setCurrentUsbFunctions(int64_t functions,
                                          const shared_ptr<IUsbGadgetCallback>& callback,
-                                         int64_t timeout, int64_t in_transactionId) override;
+                                         int64_t timeoutMs, int64_t in_transactionId) override;
 
     ScopedAStatus getCurrentUsbFunctions(const shared_ptr<IUsbGadgetCallback>& callback,
                                          int64_t in_transactionId) override;
diff --git a/usb/gadget/aidl/default/service_gadget.cpp b/usb/gadget/aidl/default/service_gadget.cpp
index 18d268d..88678ab 100644
--- a/usb/gadget/aidl/default/service_gadget.cpp
+++ b/usb/gadget/aidl/default/service_gadget.cpp
@@ -17,11 +17,6 @@
 #include <android/binder_manager.h>
 #include <android/binder_process.h>
 #include "UsbGadget.h"
-/*using android::OK;
-using android::hardware::configureRpcThreadpool;
-using android::hardware::joinRpcThreadpool;
-using android::sp;
-using android::status_t;*/
 using ::aidl::android::hardware::usb::gadget::UsbGadget;
 int main() {
     ABinderProcess_setThreadPoolMaxThreadCount(0);