diff --git a/graph/Graph.i b/graph/Graph.i
index de37391a..e7c7c352 100644
--- a/graph/Graph.i
+++ b/graph/Graph.i
@@ -83,18 +83,6 @@ private:
 
 %inline %{
 
-int
-graph_vertex_count()
-{
-  return Sta::sta()->ensureGraph()->vertexCount();
-}
-
-int
-graph_edge_count()
-{
-  return Sta::sta()->ensureGraph()->edgeCount();
-}
-
 int
 graph_arc_count()
 {
diff --git a/include/sta/Graph.hh b/include/sta/Graph.hh
index f627ee6f..8cdd7131 100644
--- a/include/sta/Graph.hh
+++ b/include/sta/Graph.hh
@@ -116,8 +116,6 @@ public:
   Required *requireds(Vertex *vertex);
   void deleteRequireds(Vertex *vertex,
                        uint32_t count);
-  size_t arrivalCount() const { return arrivals_.size(); }
-  size_t requiredCount() const { return requireds_.size(); }
   PathVertexRep *makePrevPaths(Vertex *vertex,
 			       uint32_t count);
   PathVertexRep *prevPaths(Vertex *vertex) const;
@@ -217,8 +215,8 @@ public:
   void removeDelaySlewAnnotations();
   VertexSet *regClkVertices() { return reg_clk_vertices_; }
 
-  static const int vertex_level_bits = 24;
-  static const int vertex_level_max = (1<<vertex_level_bits)-1;
+  static constexpr int vertex_level_bits = 24;
+  static constexpr int vertex_level_max = (1<<vertex_level_bits)-1;
 
 protected:
   void makeVerticesAndEdges();
diff --git a/include/sta/GraphClass.hh b/include/sta/GraphClass.hh
index 57fb9424..f105f045 100644
--- a/include/sta/GraphClass.hh
+++ b/include/sta/GraphClass.hh
@@ -62,9 +62,9 @@ typedef vector<Slew> SlewSeq;
 static constexpr int level_max = std::numeric_limits<Level>::max();
 
 // 16,777,215 tags
-static const int tag_group_index_bits = 24;
-static const TagGroupIndex tag_group_index_max = (1<<tag_group_index_bits)-1;
-static const int slew_annotated_bits = MinMax::index_count * RiseFall::index_count;
+static constexpr int tag_group_index_bits = 24;
+static constexpr TagGroupIndex tag_group_index_max = (1<<tag_group_index_bits)-1;
+static constexpr int slew_annotated_bits = MinMax::index_count * RiseFall::index_count;
 
 // Bit shifts used to mark vertices in a Bfs queue.
 enum class BfsIndex { dcalc, arrival, required, other, bits };
diff --git a/search/Search.i b/search/Search.i
index 51f6e327..9548941e 100644
--- a/search/Search.i
+++ b/search/Search.i
@@ -321,18 +321,6 @@ required_count()
   return Sta::sta()->requiredCount();
 }
 
-int
-graph_arrival_count()
-{
-  return Sta::sta()->graph()->arrivalCount();
-}
-
-int
-graph_required_count()
-{
-  return Sta::sta()->graph()->requiredCount();
-}
-
 int
 endpoint_violation_count(const MinMax *min_max)
 {