diff --git a/src/RingWindowController.mm b/src/RingWindowController.mm
index 05003a9f7b72a338795a73bbe899a1d622f0cf70..b1948a74d99758f7eb80cd4f847cd079a60d2eb5 100644
--- a/src/RingWindowController.mm
+++ b/src/RingWindowController.mm
@@ -19,6 +19,7 @@
 #import "RingWindowController.h"
 #import <QuartzCore/QuartzCore.h>
 #include <qrencode.h>
+#include <memory>
 
 //Qt
 #import <QItemSelectionModel>
@@ -31,7 +32,7 @@
 #import <call.h>
 #import <recentmodel.h>
 #import <AvailableAccountModel.h>
-
+#import <api/lrc.h>
 
 // Ring
 #import "AppDelegate.h"
@@ -64,6 +65,8 @@
     __unsafe_unretained IBOutlet NSButton* shareButton;
     __unsafe_unretained IBOutlet NSImageView* qrcodeView;
 
+    std::unique_ptr<lrc::api::Lrc> lrc_;
+
     PreferencesWC* preferencesWC;
     IBOutlet SmartViewVC* smartViewVC;
     IBOutlet PersonsVC* personsVC;
@@ -86,6 +89,8 @@ NSString* const kTrustRequestMenuItemIdentifier      = @"TrustRequestMenuItemIde
     [self.window setBackgroundColor:[NSColor colorWithRed:242.0/255 green:242.0/255 blue:242.0/255 alpha:1.0]];
     self.window.titleVisibility = NSWindowTitleHidden;
 
+    lrc_ = std::make_unique<lrc::api::Lrc>();
+
     currentCallVC = [[CurrentCallVC alloc] initWithNibName:@"CurrentCall" bundle:nil];
     offlineVC = [[ConversationVC alloc] initWithNibName:@"Conversation" bundle:nil];
     // toolbar items
diff --git a/src/main.mm b/src/main.mm
index f591fb90dfb337ffa53b2b3fb609df33a2d8c32d..34302497ef5461a223e7d1cb1d384e41b018f978 100644
--- a/src/main.mm
+++ b/src/main.mm
@@ -28,20 +28,11 @@
 #import <QLocale>
 
 //LRC
-#import <personmodel.h>
-#import <recentmodel.h>
-#import <categorizedhistorymodel.h>
-#import <localhistorycollection.h>
 #import <localprofilecollection.h>
-#import <peerprofilecollection.h>
-#import <numbercategorymodel.h>
-#import <callmodel.h>
 #import <profilemodel.h>
-#import <media/recordingmodel.h>
 
 #import "backends/AddressBookBackend.h"
 #import "delegates/ImageManipulationDelegate.h"
-#import "AccountSelectionManager.h"
 
 int main(int argc, const char *argv[]) {
 
@@ -68,25 +59,9 @@ int main(int argc, const char *argv[]) {
         }
     }
 
-    AccountSelectionManager* manager = [[AccountSelectionManager alloc] init];
-    manager.selectChosenAccount;
-    CallModel::instance();
-    CategorizedHistoryModel::instance().addCollection<LocalHistoryCollection>(LoadOptions::FORCE_ENABLED);
-
-    /* make sure basic number categories exist, in case user has no contacts
-     * from which these would be automatically created
-     */
-    NumberCategoryModel::instance().addCategory("work", QVariant());
-    NumberCategoryModel::instance().addCategory("home", QVariant());
-
     GlobalInstances::setPixmapManipulator(std::unique_ptr<Interfaces::ImageManipulationDelegate>(new Interfaces::ImageManipulationDelegate()));
 
-    PersonModel::instance().addCollection<AddressBookBackend>(LoadOptions::FORCE_ENABLED);
-    RecentModel::instance(); // Make sure RecentModel is initialized before showing UI
-
     ProfileModel::instance().addCollection<LocalProfileCollection>(LoadOptions::FORCE_ENABLED);
-    PersonModel::instance().addCollection<PeerProfileCollection>(LoadOptions::FORCE_ENABLED);
-    Media::RecordingModel::instance();
 
     return NSApplicationMain(argc, argv);
 }