diff --git a/dcalc/DelayCalc.i b/dcalc/DelayCalc.i
index 9aaa3f3f..69e23059 100644
--- a/dcalc/DelayCalc.i
+++ b/dcalc/DelayCalc.i
@@ -22,8 +22,6 @@
 // 
 // This notice may not be removed or altered from any source distribution.
 
-%module dcalc
-
 %include <std_string.i>
 
 %{
diff --git a/graph/Graph.i b/graph/Graph.i
index 7b31ebc0..d6fb1769 100644
--- a/graph/Graph.i
+++ b/graph/Graph.i
@@ -22,8 +22,6 @@
 // 
 // This notice may not be removed or altered from any source distribution.
 
-%module graph
-
 %{
 #include "Clock.hh"
 #include "FuncExpr.hh"
diff --git a/liberty/Liberty.i b/liberty/Liberty.i
index e1cfdc57..f431536f 100644
--- a/liberty/Liberty.i
+++ b/liberty/Liberty.i
@@ -22,8 +22,6 @@
 // 
 // This notice may not be removed or altered from any source distribution.
 
-%module liberty
-
 %{
 #include "PatternMatch.hh"
 #include "PortDirection.hh"
diff --git a/network/Network.i b/network/Network.i
index f36a91a0..30cfff61 100644
--- a/network/Network.i
+++ b/network/Network.i
@@ -22,8 +22,6 @@
 // 
 // This notice may not be removed or altered from any source distribution.
 
-%module network
-
 %include <std_string.i>
 
 %{
diff --git a/network/NetworkEdit.i b/network/NetworkEdit.i
index d52c2e1d..7c515f57 100644
--- a/network/NetworkEdit.i
+++ b/network/NetworkEdit.i
@@ -22,8 +22,6 @@
 // 
 // This notice may not be removed or altered from any source distribution.
 
-%module NetworkEdit
-
 %{
 using sta::Cell;
 using sta::Instance;
diff --git a/parasitics/Parasitics.i b/parasitics/Parasitics.i
index 440945ec..ab794949 100644
--- a/parasitics/Parasitics.i
+++ b/parasitics/Parasitics.i
@@ -22,8 +22,6 @@
 // 
 // This notice may not be removed or altered from any source distribution.
 
-%module parasitics
-
 %{
 #include "Sta.hh"
 
diff --git a/power/Power.i b/power/Power.i
index 52d77af7..8c2c42e3 100644
--- a/power/Power.i
+++ b/power/Power.i
@@ -22,8 +22,6 @@
 // 
 // This notice may not be removed or altered from any source distribution.
 
-%module power
-
 %{
 #include "power/Power.hh"
 
diff --git a/sdc/Sdc.i b/sdc/Sdc.i
index 996424b3..1ed85806 100644
--- a/sdc/Sdc.i
+++ b/sdc/Sdc.i
@@ -22,8 +22,6 @@
 // 
 // This notice may not be removed or altered from any source distribution.
 
-%module sdc
-
 %include "std_string.i" 
 
 %{
diff --git a/sdf/Sdf.i b/sdf/Sdf.i
index 271e9f60..8cb3a6f1 100644
--- a/sdf/Sdf.i
+++ b/sdf/Sdf.i
@@ -22,8 +22,6 @@
 // 
 // This notice may not be removed or altered from any source distribution.
 
-%module sdf
-
 %{
 #include <string>
 
diff --git a/search/Property.i b/search/Property.i
index d6d2425b..01c8b4c1 100644
--- a/search/Property.i
+++ b/search/Property.i
@@ -22,8 +22,6 @@
 // 
 // This notice may not be removed or altered from any source distribution.
 
-%module properties
-
 %{
 
 #include "Property.hh"
diff --git a/search/Search.i b/search/Search.i
index ae4e4c18..7a89abe8 100644
--- a/search/Search.i
+++ b/search/Search.i
@@ -22,8 +22,6 @@
 // 
 // This notice may not be removed or altered from any source distribution.
 
-%module search
-
 %include "std_string.i" 
 
 %{
diff --git a/search/Search.tcl b/search/Search.tcl
index 73ef64b3..dcc8f9dc 100644
--- a/search/Search.tcl
+++ b/search/Search.tcl
@@ -366,6 +366,7 @@ define_cmd_args "report_check_types" \
      [> filename] [>> filename]}
 
 proc_redirect report_check_types {
+  global sta::float_inf sta::group_path_count_max
   variable path_options
 
   parse_key_args "report_check_types" args \
@@ -484,13 +485,13 @@ proc_redirect report_check_types {
       set path_min_max "min"
     }
     if { $violators } {
-      set group_path_count $sta::group_path_count_max
-      set slack_min [expr -$sta::float_inf]
+      set group_path_count $group_path_count_max
+      set slack_min [expr -$float_inf]
       set slack_max 0.0
     } else {
       set group_path_count 1
-      set slack_min [expr -$sta::float_inf]
-      set slack_max $sta::float_inf
+      set slack_min [expr -$float_inf]
+      set slack_max $float_inf
     }
 
     set path_ends [find_path_ends "NULL" {} "NULL" 0 \
@@ -971,7 +972,7 @@ proc_redirect report_clock_min_period {
   set include_port_paths [info exists flags(-include_port_paths)]
 
   foreach clk $clks {
-    set min_period [sta::find_clk_min_period $clk $include_port_paths]
+    set min_period [find_clk_min_period $clk $include_port_paths]
     if { $min_period == 0.0 } {
       set min_period 0
       set fmax "INF"
@@ -979,7 +980,7 @@ proc_redirect report_clock_min_period {
       # max frequency in MHz
       set fmax [expr 1.0e-6 / $min_period]
     }
-    report_line "[get_name $clk] period_min = [sta::format_time $min_period 2] fmax = [format %.2f $fmax]"
+    report_line "[get_name $clk] period_min = [format_time $min_period 2] fmax = [format %.2f $fmax]"
   }
 }
 
@@ -1023,17 +1024,17 @@ proc unset_disable_inferred_clock_gating_cmd { objects } {
 
 # max slew slack / limit
 proc max_slew_check_slack_limit {} {
-  return [expr "[sta::max_slew_check_slack] / [sta::max_slew_check_limit]"]
+  return [expr "[max_slew_check_slack] / [max_slew_check_limit]"]
 }
 
 # max cap slack / limit
 proc max_capacitance_check_slack_limit {} {
-  return [expr [sta::max_capacitance_check_slack] / [sta::max_capacitance_check_limit]]
+  return [expr [max_capacitance_check_slack] / [max_capacitance_check_limit]]
 }
 
 # max fanout slack / limit
 proc max_fanout_check_slack_limit {} {
-  return [expr [sta::max_fanout_check_slack] / [sta::max_fanout_check_limit]]
+  return [expr [max_fanout_check_slack] / [max_fanout_check_limit]]
 }
 
 ################################################################
diff --git a/spice/WriteSpice.i b/spice/WriteSpice.i
index a6d5dbec..65bdda1f 100644
--- a/spice/WriteSpice.i
+++ b/spice/WriteSpice.i
@@ -22,8 +22,6 @@
 // 
 // This notice may not be removed or altered from any source distribution.
 
-%module write_gate_spice
-
 %{
 
 #include "spice/WritePathSpice.hh"
diff --git a/util/Util.i b/util/Util.i
index 5d143054..cb08647a 100644
--- a/util/Util.i
+++ b/util/Util.i
@@ -22,7 +22,6 @@
 // 
 // This notice may not be removed or altered from any source distribution.
 
-%module util
 %include <std_string.i>
 
 %{
@@ -40,16 +39,9 @@ using namespace sta;
 
 %}
 
-////////////////////////////////////////////////////////////////
-//
-// Empty class definitions to make swig happy.
-// Private constructor/destructor so swig doesn't emit them.
-//
-////////////////////////////////////////////////////////////////
-
 %inline %{
 
-float float_inf = INF;
+const float float_inf = INF;
 
 const char *
 version()
@@ -544,11 +536,3 @@ fuzzy_equal(float value1,
 }
 
 %} // inline
-
-////////////////////////////////////////////////////////////////
-//
-// Object Methods
-//
-////////////////////////////////////////////////////////////////
-
-
diff --git a/verilog/Verilog.i b/verilog/Verilog.i
index 82647cff..75ecef33 100644
--- a/verilog/Verilog.i
+++ b/verilog/Verilog.i
@@ -22,8 +22,6 @@
 // 
 // This notice may not be removed or altered from any source distribution.
 
-%module verilog
-
 %{
 #include "Sta.hh"
 #include "VerilogWriter.hh"