diff --git a/MCGalaxy/Plugins/Plugin.cs b/MCGalaxy/Plugins/Plugin.cs
index 65f4fe1ce..9150e7f87 100644
--- a/MCGalaxy/Plugins/Plugin.cs
+++ b/MCGalaxy/Plugins/Plugin.cs
@@ -15,11 +15,7 @@
     or implied. See the Licenses for the specific language governing
     permissions and limitations under the Licenses.
 */
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using System.Threading;
+using System;
 
 namespace MCGalaxy {
     /// <summary> This class provides for more advanced modification to MCGalaxy </summary>
diff --git a/MCGalaxy/Server/Server.Fields.cs b/MCGalaxy/Server/Server.Fields.cs
index 0aad15fca..3505bcfde 100644
--- a/MCGalaxy/Server/Server.Fields.cs
+++ b/MCGalaxy/Server/Server.Fields.cs
@@ -58,23 +58,11 @@ namespace MCGalaxy {
         public static PlayerMetaList RankInfo = new PlayerMetaList("text/rankinfo.txt");
         public static PlayerMetaList TempRanks = new PlayerMetaList("text/tempranks.txt");
         public static PlayerMetaList Notes = new PlayerMetaList("text/notes.txt");
-        public static Version Version { get { return System.Reflection.Assembly.GetAssembly(typeof(Server)).GetName().Version; } }
-
-        static string versionString = null;
-        static object versionLock = new object();
         
-        // Cache getting the version
-        public static string VersionString {
-            get {
-                lock (versionLock) {
-                    if (versionString == null) {
-                        Version v = Version;
-                        versionString = v.Major + "." + v.Minor + "." + v.Build + "." + v.Revision;
-                    }
-                    return versionString;
-                }
-            }
-        }
+        /// <summary> *** DO NOT USE THIS! *** Use VersionString, as this field is a constant and is inlined if used. </summary>
+        public const string InternalVersion = "1.8.9.0";
+        public static Version Version { get { return new Version(InternalVersion); } }
+        public static string VersionString { get { return InternalVersion; } }
         
         public static string SoftwareName = "MCGalaxy";
         public static string SoftwareNameVersioned { get { return SoftwareName + " " + VersionString; } }
diff --git a/MCGalaxy/properties/AssemblyInfo.cs b/MCGalaxy/properties/AssemblyInfo.cs
index a1e056972..0cb881708 100644
--- a/MCGalaxy/properties/AssemblyInfo.cs
+++ b/MCGalaxy/properties/AssemblyInfo.cs
@@ -18,35 +18,8 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
 [assembly: AssemblyTitle("MCGalaxy")]
-[assembly: AssemblyDescription("Minecraft Classic Custom Server Software")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyDescription("ClassiCube Server Software")]
 [assembly: AssemblyProduct("MCGalaxy")]
-[assembly: AssemblyCopyright("Copyright © 2015-2016")]
-[assembly: AssemblyTrademark("Forging the Way")]
-//[assembly: AssemblyDevs("MCGalaxy Development Team")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("24d9085c-78ba-4f53-b69c-f2b52153683f")]
-
-[assembly: AssemblyVersion("1.8.9.0")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// This system is to be followed in every update for easy referencing at later dates.
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
+[assembly: AssemblyCopyright("Copyright © 2015-2017")]
+[assembly: AssemblyVersion(MCGalaxy.Server.VersionInternal)]
\ No newline at end of file