diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs
index 230eb26..d8b6a5c 100644
--- a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs
+++ b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs
@@ -110,10 +110,7 @@ namespace RBXLegacyLauncher
 		{
 			if (GlobalVars.upnp == true)
 			{
-				NATUPNPLib.UPnPNATClass upnpnat = new NATUPNPLib.UPnPNATClass();
-				NATUPNPLib.IStaticPortMappingCollection mappings = upnpnat.StaticPortMappingCollection;
-				mappings.Add(GlobalVars.ServerPort, "TCP", GlobalVars.ServerPort, SecurityFuncs.GetLocalIPAddress(), true, "RBXLegacy Server Port TCP");
-				mappings.Add(GlobalVars.ServerPort, "UDP", GlobalVars.ServerPort, SecurityFuncs.GetLocalIPAddress(), true, "RBXLegacy Server Port UDP");
+				//TODO: find good libary for UPNP
 			}
 			WriteConfigValues();
 			StartServer();
@@ -822,11 +819,7 @@ namespace RBXLegacyLauncher
 		
 		void ServerExited(object sender, EventArgs e)
 		{
-			NATUPNPLib.UPnPNATClass upnpnat = new NATUPNPLib.UPnPNATClass();
-			NATUPNPLib.IStaticPortMappingCollection mappings = upnpnat.StaticPortMappingCollection;
-			
-			mappings.Remove(GlobalVars.ServerPort, "TCP");
-			mappings.Remove(GlobalVars.ServerPort, "UDP");
+			//TODO: find good libary for UPNP
 		}
 		
 		void StartStudio()
@@ -871,10 +864,7 @@ namespace RBXLegacyLauncher
 			{
 				if (GlobalVars.upnp == true)
 				{
-					NATUPNPLib.UPnPNATClass upnpnat = new NATUPNPLib.UPnPNATClass();
-					NATUPNPLib.IStaticPortMappingCollection mappings = upnpnat.StaticPortMappingCollection;
-					mappings.Add(GlobalVars.ServerPort, "TCP", GlobalVars.ServerPort, SecurityFuncs.GetLocalIPAddress(), true, "RBXLegacy Server Port TCP");
-					mappings.Add(GlobalVars.ServerPort, "UDP", GlobalVars.ServerPort, SecurityFuncs.GetLocalIPAddress(), true, "RBXLegacy Server Port UDP");
+					//TODO: find good libary for UPNP
 				}
 				StartServer();
 			}
@@ -882,10 +872,7 @@ namespace RBXLegacyLauncher
 			{
 				if (GlobalVars.upnp == true)
 				{
-					NATUPNPLib.UPnPNATClass upnpnat = new NATUPNPLib.UPnPNATClass();
-					NATUPNPLib.IStaticPortMappingCollection mappings = upnpnat.StaticPortMappingCollection;
-					mappings.Add(GlobalVars.ServerPort, "TCP", GlobalVars.ServerPort, SecurityFuncs.GetLocalIPAddress(), true, "RBXLegacy Server Port TCP");
-					mappings.Add(GlobalVars.ServerPort, "UDP", GlobalVars.ServerPort, SecurityFuncs.GetLocalIPAddress(), true, "RBXLegacy Server Port UDP");
+					//TODO: find good libary for UPNP
 				}
 				StartServerNo3D();
 			}
@@ -893,10 +880,7 @@ namespace RBXLegacyLauncher
 			{
 				if (GlobalVars.upnp == true)
 				{
-					NATUPNPLib.UPnPNATClass upnpnat = new NATUPNPLib.UPnPNATClass();
-					NATUPNPLib.IStaticPortMappingCollection mappings = upnpnat.StaticPortMappingCollection;
-					mappings.Add(GlobalVars.ServerPort, "TCP", GlobalVars.ServerPort, SecurityFuncs.GetLocalIPAddress(), true, "RBXLegacy Server Port TCP");
-					mappings.Add(GlobalVars.ServerPort, "UDP", GlobalVars.ServerPort, SecurityFuncs.GetLocalIPAddress(), true, "RBXLegacy Server Port UDP");
+					//TODO: find good libary for UPNP
 				}
 				StartServerNo3D();
 			}
diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/RBXLegacyLauncher.csproj b/RBXLegacyLauncher/RBXLegacyLauncher/RBXLegacyLauncher.csproj
index 698424e..97ef50d 100644
--- a/RBXLegacyLauncher/RBXLegacyLauncher/RBXLegacyLauncher.csproj
+++ b/RBXLegacyLauncher/RBXLegacyLauncher/RBXLegacyLauncher.csproj
@@ -119,15 +119,5 @@
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
-  <ItemGroup>
-    <COMReference Include="NATUPNPLib">
-      <Guid>{1C565858-F302-471E-B409-F180AA4ABEC6}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-    </COMReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file