diff --git a/lib/finder-app.js b/lib/finder-app.js
index ecfdee4c..7cba04bf 100755
--- a/lib/finder-app.js
+++ b/lib/finder-app.js
@@ -1,13 +1,10 @@
 const electron = require('electron')
 const app = electron.app
 
-var finderWindow = null
-
 app.on('ready', function () {
   if (process.platform === 'darwin') {
     app.dock.hide()
   }
-  finderWindow = require('./finder-window')
 })
 
 module.exports = app
diff --git a/lib/main-app.js b/lib/main-app.js
index 8e67feec..4cc1d2c6 100644
--- a/lib/main-app.js
+++ b/lib/main-app.js
@@ -2,7 +2,6 @@ const electron = require('electron')
 const app = electron.app
 const Menu = electron.Menu
 const ipc = electron.ipcMain
-const autoUpdater = electron.autoUpdater
 const path = require('path')
 const ChildProcess = require('child_process')
 const _ = require('lodash')
@@ -11,9 +10,8 @@ const GhReleases = require('electron-gh-releases')
 var ipcServer = null
 
 var mainWindow = null
-var finderWindow = null
 
-var shouldQuit = app.makeSingleInstance(function(commandLine, workingDirectory) {
+var shouldQuit = app.makeSingleInstance(function (commandLine, workingDirectory) {
   if (mainWindow) {
     if (process.platform === 'win32') {
       mainWindow.minimize()
@@ -26,12 +24,8 @@ var shouldQuit = app.makeSingleInstance(function(commandLine, workingDirectory)
 
 if (shouldQuit) {
   app.quit()
-  return
 }
 
-var version = app.getVersion()
-var versionText = (version == null || version.length === 0) ? 'DEV version' : 'v' + version
-
 var isUpdateReady = false
 
 var ghReleasesOpts = {
@@ -108,14 +102,9 @@ app.on('ready', function () {
       Menu.setApplicationMenu(menu)
       break
     case 'win32':
-      finderWindow = require('./finder-window')
       mainWindow.setMenu(menu)
       break
     case 'linux':
-      // Finder is available on cinnamon only.
-      if (process.env.DESKTOP_SESSION === 'cinnamon') {
-        finderWindow = require('./finder-window')
-      }
       Menu.setApplicationMenu(menu)
       mainWindow.setMenu(menu)
   }