diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index cbe6eff75c..960989d3b0 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -149,7 +149,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             AssetCache assetCache, AgentCircuitManager circuitManager)
         {
             // XXX Temporary until we start unpacking the config source
-            // TODO: Don't forget to account for the null possibility
             ClientStackUserSettings userSettings = new ClientStackUserSettings();
                 
             proxyPortOffset = proxyPortOffsetParm;
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
index 0acb611ca3..56bb3575a6 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
@@ -84,7 +84,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
                     _log.InfoFormat("[Concierge] module disabled by OpenSim.ini configuration");
                     return;
                 }
-
             }
             catch (Exception)
             {