Reworked devices()
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 349943e..dff8c18 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -435,14 +435,10 @@
                 if not grep_str:
                     self.handle.sendline("devices")
                     self.handle.expect("onos>")
-                    self.handle.sendline("")
-                    self.handle.expect("onos>")
                 else:
                     self.handle.sendline("devices | grep '"+
                         str(grep_str)+"'")
                     self.handle.expect("onos>")
-                    self.handle.sendline("")
-                    self.handle.expect("onos>")
                 handle = self.handle.before
                 print "handle =",handle
                 return handle
@@ -950,7 +946,6 @@
             # append to id_list
             for arg in temp_list:
                 id_list.append(arg.split("id=")[1])
-            
             return id_list
 
         except pexpect.EOF: