diff --git a/src/app/SharpRaven/Data/JsonPacket.cs b/src/app/SharpRaven/Data/JsonPacket.cs
index d8ee9d1d..b497bec8 100644
--- a/src/app/SharpRaven/Data/JsonPacket.cs
+++ b/src/app/SharpRaven/Data/JsonPacket.cs
@@ -106,9 +106,7 @@ public JsonPacket(string project)
         private JsonPacket()
         {
             // Get assemblies.
-            Modules = SystemUtil
-                .GetModules()
-                .ToDictionary(k => k.Name, v => v.Version);
+            Modules = SystemUtil.GetModules();
 
             // The current hostname
             ServerName = Environment.MachineName;
diff --git a/src/app/SharpRaven/Data/SentryModule.cs b/src/app/SharpRaven/Data/SentryModule.cs
deleted file mode 100644
index 10d23356..00000000
--- a/src/app/SharpRaven/Data/SentryModule.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-#region License
-
-// Copyright (c) 2014 The Sentry Team and individual contributors.
-// All rights reserved.
-// 
-// Redistribution and use in source and binary forms, with or without modification, are permitted
-// provided that the following conditions are met:
-// 
-//     1. Redistributions of source code must retain the above copyright notice, this list of
-//        conditions and the following disclaimer.
-// 
-//     2. Redistributions in binary form must reproduce the above copyright notice, this list of
-//        conditions and the following disclaimer in the documentation and/or other materials
-//        provided with the distribution.
-// 
-//     3. Neither the name of the Sentry nor the names of its contributors may be used to
-//        endorse or promote products derived from this software without specific prior written
-//        permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
-// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#endregion
-
-namespace SharpRaven.Data
-{
-    /// <summary>
-    /// A module or library that might be in use and thus could relevant for debugging purposes.
-    /// </summary>
-    public class SentryModule
-    {
-        /// <summary>
-        /// Gets or sets the name of the module (or library).
-        /// </summary>
-        /// <value>
-        /// The name of the module (or library).
-        /// </value>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the version of the module (or library).
-        /// </summary>
-        /// <value>
-        /// The version of the module (or library).
-        /// </value>
-        public string Version { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/app/SharpRaven/SharpRaven.csproj b/src/app/SharpRaven/SharpRaven.csproj
index c63214c1..837bf421 100644
--- a/src/app/SharpRaven/SharpRaven.csproj
+++ b/src/app/SharpRaven/SharpRaven.csproj
@@ -79,7 +79,6 @@
     <Compile Include="Data\ExceptionFrame.cs" />
     <Compile Include="Data\IJsonPacketFactory.cs" />
     <Compile Include="Data\SentryMessage.cs" />
-    <Compile Include="Data\SentryModule.cs" />
     <Compile Include="Data\SentryException.cs" />
     <Compile Include="Data\SentryRequest.cs" />
     <Compile Include="Data\SentryStacktrace.cs" />
diff --git a/src/app/SharpRaven/Utilities/SystemUtil.cs b/src/app/SharpRaven/Utilities/SystemUtil.cs
index 3a7a2bd4..98b622f1 100644
--- a/src/app/SharpRaven/Utilities/SystemUtil.cs
+++ b/src/app/SharpRaven/Utilities/SystemUtil.cs
@@ -32,8 +32,6 @@
 using System.Collections.Generic;
 using System.Linq;
 
-using SharpRaven.Data;
-
 namespace SharpRaven.Utilities
 {
     /// <summary>
@@ -47,15 +45,24 @@ public static class SystemUtil
         /// <returns>
         /// All loaded modules.
         /// </returns>
-        public static IEnumerable<SentryModule> GetModules()
+        public static IDictionary<string, string> GetModules()
         {
-            var assemblies = AppDomain.CurrentDomain.GetAssemblies();
+            var assemblies = AppDomain.CurrentDomain
+                                      .GetAssemblies()
+                                      .Select(a => a.GetName())
+                                      .OrderBy(a => a.Name);
+
+            var dictionary = new Dictionary<string, string>();
 
-            return assemblies.Select(a => a.GetName()).OrderBy(a => a.Name).Select(a => new SentryModule
+            foreach (var assembly in assemblies)
             {
-                Name = a.Name,
-                Version = a.Version.ToString()
-            });
+                if (dictionary.ContainsKey(assembly.Name))
+                    continue;
+
+                dictionary.Add(assembly.Name, assembly.Version.ToString());
+            }
+
+            return dictionary;
         }
     }
 }
\ No newline at end of file