diff --git a/XBMC Remote/MasterViewController.h b/XBMC Remote/MasterViewController.h
index fba29eacc..1670e5753 100644
--- a/XBMC Remote/MasterViewController.h	
+++ b/XBMC Remote/MasterViewController.h	
@@ -12,22 +12,8 @@
 #import "CustomNavigationController.h"
 #import "MessagesView.h"
 
-@class DetailViewController;
-@class NowPlaying;
-@class RemoteController;
-@class HostManagementViewController;
-@class AppInfoViewController;
-@class HostManagementViewController;
-
 @interface MasterViewController : UIViewController <UITableViewDataSource, UITableViewDelegate> {
     IBOutlet UITableView *menuList;
-    UIButton *xbmcInfo;
-    UIButton *xbmcLogo;
-    UIButton *powerButton;
-    NSDictionary *checkServerParams;
-    NSIndexPath *storeServerSelection;
-    AppInfoViewController *appInfoView;
-    HostManagementViewController *hostManagementViewController;
     BOOL itemIsActive;
     CustomNavigationController *navController;
     UIImageView *globalConnectionStatus;
@@ -35,10 +21,6 @@
 }
 
 @property (nonatomic, strong) NSMutableArray *mainMenu;
-@property (strong, nonatomic) DetailViewController *detailViewController;
-@property (strong, nonatomic) NowPlaying *nowPlaying;
-@property (strong, nonatomic) RemoteController *remoteController;
-@property (strong, nonatomic) HostManagementViewController *hostController;
 @property (strong, nonatomic) tcpJSONRPC *tcpJSONRPCconnection;
 
 @end
diff --git a/XBMC Remote/MasterViewController.m b/XBMC Remote/MasterViewController.m
index f5572d8c5..b6732f42e 100644
--- a/XBMC Remote/MasterViewController.m	
+++ b/XBMC Remote/MasterViewController.m	
@@ -38,10 +38,6 @@ @interface MasterViewController () {
 
 @implementation MasterViewController
 
-@synthesize detailViewController = _detailViewController;
-@synthesize nowPlaying = _nowPlaying;
-@synthesize remoteController = _remoteController;
-@synthesize hostController = _hostController;
 @synthesize mainMenu;
 @synthesize tcpJSONRPCconnection;
 
@@ -153,27 +149,36 @@ - (void)tableView:(UITableView*)tableView didSelectRowAtIndexPath:(NSIndexPath*)
     BOOL hideBottonLine = NO;
     switch (item.family) {
         case FamilyNowPlaying:
-            self.nowPlaying = [[NowPlaying alloc] initWithNibName:@"NowPlaying" bundle:nil];
-            self.nowPlaying.detailItem = item;
-            object = self.nowPlaying;
+        {
+            NowPlaying *nowPlayingController = [[NowPlaying alloc] initWithNibName:@"NowPlaying" bundle:nil];
+            nowPlayingController.detailItem = item;
+            object = nowPlayingController;
             break;
+        }
         case FamilyRemote:
-            [self.remoteController resetRemote];
-            self.remoteController = [[RemoteController alloc] initWithNibName:@"RemoteController" withEmbedded:NO bundle:nil];
-            self.remoteController.detailItem = item;
-            object = self.remoteController;
+        {
+            RemoteController *remoteController = [[RemoteController alloc] initWithNibName:@"RemoteController" withEmbedded:NO bundle:nil];
+            remoteController.detailItem = item;
+            object = remoteController;
             break;
+        }
         case FamilyServer:
-            self.hostController = [[HostManagementViewController alloc] initWithNibName:@"HostManagementViewController" bundle:nil];
-            object = self.hostController;
+        {
+            HostManagementViewController *hostController = [[HostManagementViewController alloc] initWithNibName:@"HostManagementViewController" bundle:nil];
+            object = hostController;
             hideBottonLine = YES;
             break;
+        }
         case FamilyDetailView:
-            self.detailViewController = [[DetailViewController alloc] initWithNibName:@"DetailViewController" bundle:nil];
-            self.detailViewController.detailItem = item;
-            object = self.detailViewController;
+        {
+            DetailViewController *detailViewController = [[DetailViewController alloc] initWithNibName:@"DetailViewController" bundle:nil];
+            detailViewController.detailItem = item;
+            object = detailViewController;
             hideBottonLine = YES;
             break;
+        }
+        default:
+            break;
     }
     navController = [[CustomNavigationController alloc] initWithRootViewController:object];
     navController.navigationBar.barStyle = UIBarStyleBlack;
@@ -341,7 +346,6 @@ - (void)viewDidLoad {
     XBMCVirtualKeyboard *virtualKeyboard = [[XBMCVirtualKeyboard alloc] initWithFrame:CGRectMake(0, 0, 1, 1)];
     [self.view addSubview:virtualKeyboard];
     AppDelegate.instance.obj = [GlobalData getInstance];
-    checkServerParams = @{@"properties": @[@"version", @"volume"]};
     menuList.scrollsToTop = NO;
     
     // Add connection status icon to root view
diff --git a/XBMC Remote/RemoteController.h b/XBMC Remote/RemoteController.h
index af84e5957..5a59cc0db 100644
--- a/XBMC Remote/RemoteController.h	
+++ b/XBMC Remote/RemoteController.h	
@@ -52,7 +52,6 @@ typedef NS_ENUM(NSInteger, RemotePositionType) {
 
 - (IBAction)startVibrate:(id)sender;
 - (void)setEmbeddedView;
-- (void)resetRemote;
 - (id)initWithNibName:(NSString*)nibNameOrNil withEmbedded:(BOOL)withEmbedded bundle:(NSBundle*)nibBundleOrNil;
 @property (strong, nonatomic) id detailItem;
 @property (nonatomic, strong) NSTimer *holdKeyTimer;