diff --git a/src/fenrir/core/fenrirManager.py b/src/fenrir/core/fenrirManager.py
index 6a375ca8..31c2439e 100644
--- a/src/fenrir/core/fenrirManager.py
+++ b/src/fenrir/core/fenrirManager.py
@@ -56,31 +56,32 @@ class fenrirManager():
         if event['Data']:        
             event['Data']['EventName'] = self.environment['runtime']['inputManager'].convertEventName(event['Data']['EventName'])        
             self.environment['runtime']['inputManager'].handleInputEvent(event['Data'])
+        else:
+            return
         if self.environment['runtime']['inputManager'].noKeyPressed(): 
             self.environment['runtime']['inputManager'].clearLastDeepInput()        
-        if True:
-            if self.environment['runtime']['screenManager'].isSuspendingScreen():
-                self.environment['runtime']['inputManager'].writeEventBuffer()            
-            else: 
-                if self.environment['runtime']['helpManager'].isTutorialMode():
-                    self.environment['runtime']['inputManager'].clearEventBuffer()               
+        if self.environment['runtime']['screenManager'].isSuspendingScreen():
+            self.environment['runtime']['inputManager'].writeEventBuffer()            
+        else: 
+            if self.environment['runtime']['helpManager'].isTutorialMode():
+                self.environment['runtime']['inputManager'].clearEventBuffer()               
 
-                self.detectCommand()                       
+            self.detectCommand()                       
 
-                if self.modifierInput:
-                    self.environment['runtime']['inputManager'].clearEventBuffer()                   
-                if self.singleKeyCommand:
-                    if self.environment['runtime']['inputManager'].noKeyPressed():
-                        self.environment['runtime']['inputManager'].clearEventBuffer() 
-                else:              
-                    self.environment['runtime']['inputManager'].writeEventBuffer()                                      
-            if self.environment['runtime']['inputManager'].noKeyPressed():
-                self.modifierInput = False
-                self.singleKeyCommand = False  
-            if self.environment['input']['keyForeward'] > 0:
-                self.environment['input']['keyForeward'] -=1
-            self.environment['runtime']['screenManager'].update('onInput')                            
-            self.environment['runtime']['commandManager'].executeDefaultTrigger('onInput')       
+            if self.modifierInput:
+                self.environment['runtime']['inputManager'].clearEventBuffer()                   
+            if self.singleKeyCommand:
+                if self.environment['runtime']['inputManager'].noKeyPressed():
+                    self.environment['runtime']['inputManager'].clearEventBuffer() 
+            else:              
+                self.environment['runtime']['inputManager'].writeEventBuffer()                                      
+        if self.environment['runtime']['inputManager'].noKeyPressed():
+            self.modifierInput = False
+            self.singleKeyCommand = False  
+        if self.environment['input']['keyForeward'] > 0:
+            self.environment['input']['keyForeward'] -=1
+        self.environment['runtime']['screenManager'].update('onInput')                            
+        self.environment['runtime']['commandManager'].executeDefaultTrigger('onInput')       
         #print('handleInput:',time.time() - startTime)
     def handleExecuteCommand(self, event):        
         if event['Data'] == '':
diff --git a/src/fenrir/inputDriver/evdevDriver.py b/src/fenrir/inputDriver/evdevDriver.py
index 44e8fa36..10a65701 100644
--- a/src/fenrir/inputDriver/evdevDriver.py
+++ b/src/fenrir/inputDriver/evdevDriver.py
@@ -84,19 +84,14 @@ class driver(inputDriver):
                 except:
                     self.removeDevice(fd)
                 while(event):
-                    self.env['runtime']['debug'].writeDebugOut('DEBUG INPUT1:'  + str(event),debug.debugLevel.INFO)                                               
                     self.env['input']['eventBuffer'].append( [self.iDevices[fd], self.uDevices[fd], event])
                     if event.type == evdev.events.EV_KEY:
-                        self.env['runtime']['debug'].writeDebugOut('DEBUG INPUT2:'  + str(event),debug.debugLevel.INFO)                                                                                                       
                         if event.code != 0:
-                            self.env['runtime']['debug'].writeDebugOut('DEBUG INPUT3:'  + str(event),debug.debugLevel.INFO)                                                                               
                             currMapEvent = self.mapEvent(event)
                             if not currMapEvent:
                                 foreward = True                            
-                                self.env['runtime']['debug'].writeDebugOut('DEBUG INPUT4:'  + str(currMapEvent),debug.debugLevel.INFO)                                                                                                               
                             if not isinstance(currMapEvent['EventName'], str):
                                 foreward = True                            
-                                self.env['runtime']['debug'].writeDebugOut('DEBUG INPUT5:'  + str(currMapEvent),debug.debugLevel.INFO)                                                                               
                             if not foreward or eventFired:
                                 if currMapEvent['EventState'] in [0,1,2]:
                                     eventQueue.put({"Type":fenrirEventType.KeyboardInput,"Data":currMapEvent.copy()}) 
@@ -105,7 +100,6 @@ class driver(inputDriver):
                     else:
                         if not event.type in [0,4]:
                             foreward = True
-                            self.env['runtime']['debug'].writeDebugOut('DEBUG INPUT7:'  + str(currMapEvent),debug.debugLevel.INFO)                                               
                           
                     event = self.iDevices[fd].read_one()   
                 if foreward and not eventFired: