diff --git a/HeliosDisplayManagement.Shared/Profile.cs b/HeliosDisplayManagement.Shared/Profile.cs
index 9631ebc..98c75c8 100644
--- a/HeliosDisplayManagement.Shared/Profile.cs
+++ b/HeliosDisplayManagement.Shared/Profile.cs
@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Windows.Forms;
@@ -10,18 +9,12 @@ using System.Diagnostics;
 using WindowsDisplayAPI.DisplayConfig;
 using HeliosPlus.Shared.Resources;
 using Newtonsoft.Json;
-//using NvAPIWrapper.Display;
-using NvAPIWrapper.GPU;
 using NvAPIWrapper.Mosaic;
-//using Appccelerate.StateMachine;
 using NvAPIWrapper.Native.Mosaic;
 using HeliosPlus.Shared.Topology;
 using System.Drawing;
 using System.Drawing.Imaging;
 using WindowsDisplayAPI;
-using WindowsDisplayAPI.DisplayConfig;
-using WindowsDisplayAPI.Native.DisplayConfig;
-using System.Text.RegularExpressions;
 
 namespace HeliosPlus.Shared
 {
diff --git a/HeliosDisplayManagement/UIForms/DisplayProfileForm.cs b/HeliosDisplayManagement/UIForms/DisplayProfileForm.cs
index 15e98eb..a005df9 100644
--- a/HeliosDisplayManagement/UIForms/DisplayProfileForm.cs
+++ b/HeliosDisplayManagement/UIForms/DisplayProfileForm.cs
@@ -13,9 +13,6 @@ namespace HeliosPlus.UIForms
 {
     internal partial class DisplayProfileForm : Form
     {
-        private const string GroupActive = "active";
-        private const string GroupCurrent = "current";
-        private const string GroupSaved = "saved";
         private Profile _selectedProfile;
         private List<Profile> _savedProfiles = new List<Profile>();
         private string _saveOrRenameMode = "save";
diff --git a/HeliosDisplayManagement/UIForms/ShortcutForm.cs b/HeliosDisplayManagement/UIForms/ShortcutForm.cs
index 073bab8..d8ee4af 100644
--- a/HeliosDisplayManagement/UIForms/ShortcutForm.cs
+++ b/HeliosDisplayManagement/UIForms/ShortcutForm.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing.IconLib;
-using System.Drawing.IconLib.Exceptions;
 using System.Drawing;
 using System.IO;
 using System.Linq;
@@ -11,9 +10,6 @@ using System.Windows.Forms;
 using HeliosPlus.Resources;
 using HeliosPlus.Shared;
 using HeliosPlus.GameLibraries;
-using NvAPIWrapper.Native.GPU;
-using TsudaKageyu;
-using System.Text.RegularExpressions;
 using System.Globalization;
 
 namespace HeliosPlus.UIForms
@@ -24,33 +20,10 @@ namespace HeliosPlus.UIForms
         List<SteamGame> _allSteamGames;
         internal Profile[] _allProfiles; 
 
-        /* private ListViewItem AddProfile(Profile profile = null)
-        {
-            il_profiles.Images.Add(
-                new ProfileIcon(profile ?? Profile.GetCurrent()).ToBitmap(
-                    il_profiles.ImageSize.Width,
-                    il_profiles.ImageSize.Height));
-
-            return lv_profiles.Items.Add(new ListViewItem
-            {
-                Text = profile?.Name ?? Language.Current,
-                ImageIndex = il_profiles.Images.Count - 1,
-                Tag = profile,
-                Group =
-                    lv_profiles.Groups[profile == null ? GroupCurrent : (profile.IsActive ? GroupActive : GroupSaved)]
-            });
-
-        }*/
-
-
         public ShortcutForm()
         {
             InitializeComponent();
             
-            /*lv_profiles.Groups.Add(GroupCurrent, Language.Current);
-            lv_profiles.Groups.Add(GroupActive, Language.Active_Profiles);
-            lv_profiles.Groups.Add(GroupSaved, Language.Saved_Profiles);
-            lbl_version.Text = string.Format(lbl_version.Text, Assembly.GetExecutingAssembly().GetName().Version);*/
         }
 
         public ShortcutForm(Profile profile) : this()