diff --git a/JiraTimeBotForm/JiraIntegration/IJiraDescriptionSource.cs b/JiraTimeBotForm/JiraIntegration/IJiraDescriptionSource.cs
index 4c42f8a..92ca9f9 100644
--- a/JiraTimeBotForm/JiraIntegration/IJiraDescriptionSource.cs
+++ b/JiraTimeBotForm/JiraIntegration/IJiraDescriptionSource.cs
@@ -1,6 +1,4 @@
-using System.Text;
-using System.Threading.Tasks;
-using JiraTimeBotForm.TaskTime;
+using JiraTimeBotForm.TaskTime;
 
 namespace JiraTimeBotForm.JiraIntegration
 {
diff --git a/JiraTimeBotForm/JiraIntegration/JiraDescriptionSource.cs b/JiraTimeBotForm/JiraIntegration/JiraDescriptionSource.cs
index a370e07..42526a3 100644
--- a/JiraTimeBotForm/JiraIntegration/JiraDescriptionSource.cs
+++ b/JiraTimeBotForm/JiraIntegration/JiraDescriptionSource.cs
@@ -15,13 +15,12 @@ namespace JiraTimeBotForm.JiraIntegration
 
         public string GetDescription(TaskTimeItem taskTimeItem, bool addCommentsToWorklog)
         {
-            var comment = _dummyComments.OrderBy(f=>Guid.NewGuid()).FirstOrDefault();
             if (addCommentsToWorklog)
             {
-                comment = taskTimeItem.Description;
+                return taskTimeItem.Description;
             }
 
-            return comment;
+            return _dummyComments.OrderBy(f => Guid.NewGuid()).FirstOrDefault();
         }
     }
 }
\ No newline at end of file
diff --git a/JiraTimeBotForm/Mercurial/ICommitSkipper.cs b/JiraTimeBotForm/Mercurial/ICommitSkipper.cs
index 198f6d3..14178d6 100644
--- a/JiraTimeBotForm/Mercurial/ICommitSkipper.cs
+++ b/JiraTimeBotForm/Mercurial/ICommitSkipper.cs
@@ -1,9 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace JiraTimeBotForm.Mercurial
+namespace JiraTimeBotForm.Mercurial
 {
     public interface ICommitSkipper
     {
diff --git a/JiraTimeBotForm/TasksProcessors/ITasksProcessors.cs b/JiraTimeBotForm/TasksProcessors/ITasksProcessors.cs
index 8ff5dcd..468cdcd 100644
--- a/JiraTimeBotForm/TasksProcessors/ITasksProcessors.cs
+++ b/JiraTimeBotForm/TasksProcessors/ITasksProcessors.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace JiraTimeBotForm.TasksProcessors
+namespace JiraTimeBotForm.TasksProcessors
 {
     public interface ITasksProcessors
     {
diff --git a/JiraTimeBotForm/UI/TrayMenu.cs b/JiraTimeBotForm/UI/TrayMenu.cs
index e5753f6..944f71a 100644
--- a/JiraTimeBotForm/UI/TrayMenu.cs
+++ b/JiraTimeBotForm/UI/TrayMenu.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace JiraTimeBotForm.UI