diff --git a/BT Vendor/FirstAppExample/EMDevicePickerViewController.m b/BT Vendor/FirstAppExample/EMDevicePickerViewController.m
index 6f5ec4f..0f71892 100644
--- a/BT Vendor/FirstAppExample/EMDevicePickerViewController.m
+++ b/BT Vendor/FirstAppExample/EMDevicePickerViewController.m
@@ -120,7 +120,6 @@
 
 -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    [self performSegueWithIdentifier:@"ConnectionSegue" sender:self];
     if(![[[[tableView cellForRowAtIndexPath:indexPath] textLabel] text] isEqualToString:NSLocalizedString(@"Searching for devices...",nil)])
     {
         [self _showConnectingView];
diff --git a/BT Vendor/MenuTableViewController.m b/BT Vendor/MenuTableViewController.m
index 86be65f..e2ae349 100644
--- a/BT Vendor/MenuTableViewController.m
+++ b/BT Vendor/MenuTableViewController.m
@@ -626,11 +626,9 @@
     self.currentNavLevel = 255;
     
     //Initialize menu view
-    
     [_protocol establishConnection];
-    //[self setSentCommand:HELLO];
-    //[self startTimeoutTimer];
-    [self changeNavLevel:MENU :FALSE]; //HACK!
+    [self setSentCommand:HELLO];
+    [self startTimeoutTimer];
     
     //Detect handled URL
     if(self.appDelegate.handledURL != nil)