diff --git a/pcbnew/pcbnew.h b/pcbnew/pcbnew.h
index 8209549772..b96dcf3968 100644
--- a/pcbnew/pcbnew.h
+++ b/pcbnew/pcbnew.h
@@ -86,11 +86,6 @@ extern bool     g_Alternate_Track_Posture;
 extern PCB_LAYER_ID g_Route_Layer_TOP;
 extern PCB_LAYER_ID g_Route_Layer_BOTTOM;
 
-extern bool     g_TwoSegmentTrackBuild;
-
-extern int      g_MagneticPadOption;
-extern int      g_MagneticTrackOption;
-
 extern wxPoint  g_Offset_Module;         // Offset trace when moving footprint.
 
 /// List of segments of the trace currently being drawn.
diff --git a/pcbnew/pcbnew_config.cpp b/pcbnew/pcbnew_config.cpp
index f0e3890eb0..d935164149 100644
--- a/pcbnew/pcbnew_config.cpp
+++ b/pcbnew/pcbnew_config.cpp
@@ -249,21 +249,11 @@ PARAM_CFG_ARRAY& PCB_EDIT_FRAME::GetConfigurationSettings()
         m_configParams.push_back( new PARAM_CFG_INT( true, wxT( "PcbShowZonesMode" ),
                                                        &displ_opts->m_DisplayZonesMode, 0, 0, 2 ) );
 
-        // layer colors:
-
-
         // Miscellaneous:
-        m_configParams.push_back( new PARAM_CFG_INT( true, wxT( "RotationAngle" ), &m_rotationAngle,
-                                                       900, 1, 900 ) );
+        m_configParams.push_back( new PARAM_CFG_INT( true, wxT( "RotationAngle" ),
+                                                       &m_rotationAngle, 900, 1, 900 ) );
         m_configParams.push_back( new PARAM_CFG_INT( true, wxT( "MaxLnkS" ),
-                                                       &displ_opts->m_MaxLinksShowed,
-                                                       3, 0, 15 ) );
-
-//FIXMEd
-/*        m_configParams.push_back( new PARAM_CFG_BOOL( true, wxT( "TwoSegT" ),
-                                                        &g_TwoSegmentTrackBuild, true ) );
-        m_configParams.push_back( new PARAM_CFG_BOOL( true, wxT( "SegmPcb45Only" )
-                                                        , &g_Segments_45_Only, true ) );*/
+                                                       &displ_opts->m_MaxLinksShowed, 3, 0, 15 ) );
     }
 
     return m_configParams;