diff --git a/src/main.py b/src/main.py
index 147155c9..4c746bd5 100644
--- a/src/main.py
+++ b/src/main.py
@@ -1,22 +1,16 @@
 # -*- coding: utf-8 -*-
-import platform
 from win32com.client import GetObject
-
-""" there are lots of things not implemented for Gtk+ yet.
-    We've started this effort 1 Apr 2015 so it isn't fully functional. We will remove the ifs statements when are no needed"""
-
-system = platform.system()
-if system == "Windows":
-    import sys
-    import os
-    #redirect the original stdout and stderr
-    stdout=sys.stdout
-    stderr=sys.stderr
-    sys.stdout = open(os.path.join(os.getenv("temp"), "stdout.log"), "w")
-    sys.stderr = open(os.path.join(os.getenv("temp"), "stderr.log"), "w")
+import sys
+import os
+import platform
+#redirect the original stdout and stderr
+stdout=sys.stdout
+stderr=sys.stderr
+sys.stdout = open(os.path.join(os.getenv("temp"), "stdout.log"), "w")
+sys.stderr = open(os.path.join(os.getenv("temp"), "stderr.log"), "w")
 import languageHandler
 import paths
-#check if TWBlue is installed (Windows only)
+#check if TWBlue is installed
 # ToDo: Remove this soon as this is done already when importing the paths module.
 if os.path.exists(os.path.join(paths.app_path(), "Uninstall.exe")):
     paths.mode="installed"
@@ -31,34 +25,30 @@ import fixes
 import widgetUtils
 import webbrowser
 from wxUI import commonMessageDialogs
-if system == "Windows":
-    from logger import logger
-    from update import updater
-    stdout_temp=sys.stdout
-    stderr_temp=sys.stderr
+from logger import logger
+from update import updater
+stdout_temp=sys.stdout
+stderr_temp=sys.stderr
 #if it's a binary version
-    if hasattr(sys, 'frozen'):
-        sys.stderr = open(os.path.join(paths.logs_path(), "stderr.log"), 'w')
-        sys.stdout = open(os.path.join(paths.logs_path(), "stdout.log"), 'w')
-    else:
-        sys.stdout=stdout
-        sys.stderr=stderr
-        # We are running from source, let's prepare vlc module for that situation
-        if system=="Windows":
-            arch="x86"
-            if platform.architecture()[0][:2] == "64":
-                arch="x64"
-            os.environ['PYTHON_VLC_MODULE_PATH']=os.path.abspath(os.path.join(paths.app_path(), "..", "windows-dependencies", arch))
-            os.environ['PYTHON_VLC_LIB_PATH']=os.path.abspath(os.path.join(paths.app_path(), "..", "windows-dependencies", arch, "libvlc.dll"))
-    #the final log files have been opened succesfully, let's close the temporary files
-    stdout_temp.close()
-    stderr_temp.close()
-    #finally, remove the temporary files. TW Blue doesn't need them anymore, and we will get more free space on the harddrive
-    os.remove(stdout_temp.name)
-    os.remove(stderr_temp.name)
+if hasattr(sys, 'frozen'):
+    sys.stderr = open(os.path.join(paths.logs_path(), "stderr.log"), 'w')
+    sys.stdout = open(os.path.join(paths.logs_path(), "stdout.log"), 'w')
+else:
+    sys.stdout=stdout
+    sys.stderr=stderr
+    # We are running from source, let's prepare vlc module for that situation
+    arch="x86"
+    if platform.architecture()[0][:2] == "64":
+        arch="x64"
+    os.environ['PYTHON_VLC_MODULE_PATH']=os.path.abspath(os.path.join(paths.app_path(), "..", "windows-dependencies", arch))
+    os.environ['PYTHON_VLC_LIB_PATH']=os.path.abspath(os.path.join(paths.app_path(), "..", "windows-dependencies", arch, "libvlc.dll"))
+#the final log files have been opened succesfully, let's close the temporary files
+stdout_temp.close()
+stderr_temp.close()
+#finally, remove the temporary files. TW Blue doesn't need them anymore, and we will get more free space on the harddrive
+os.remove(stdout_temp.name)
+os.remove(stderr_temp.name)
 import sound
-if system == "Linux":
-    from gi.repository import Gdk, GObject, GLib
 
 log = logging.getLogger("main")
 
@@ -79,14 +69,14 @@ def setup():
     from sessionmanager import sessionManager
     app = widgetUtils.mainLoopObject()
     check_pid()
-    if system == "Windows":
-        if config.app["app-settings"]["donation_dialog_displayed"] == False:
-            donation()
-        if config.app['app-settings']['check_for_updates']:
-            updater.do_update()
+    if config.app["app-settings"]["donation_dialog_displayed"] == False:
+        donation()
+    if config.app['app-settings']['check_for_updates']:
+        updater.do_update()
     sm = sessionManager.sessionManagerController()
     sm.fill_list()
-    if len(sm.sessions) == 0: sm.show()
+    if len(sm.sessions) == 0:
+        sm.show()
     else:
         sm.do_ok()
     if hasattr(sm.view, "destroy"):
@@ -96,10 +86,7 @@ def setup():
     r.view.show()
     r.do_work()
     r.check_invisible_at_startup()
-    if system == "Windows":
-        call_threaded(r.start)
-    elif system == "Linux":
-        GLib.idle_add(r.start)
+    call_threaded(r.start)
     app.run()
 
 def proxy_setup():