1 files changed, 13 insertions, 21 deletions

diff --git a/amount.h b/amount.h
index 4db7a5eb..8019680c 100644
--- a/amount.h
+++ b/amount.h
@@ -551,40 +551,32 @@ class annotated_commodity_t : public commodity_t
   std::time_t date;
   std::string tag;
 
+  explicit annotated_commodity_t() {
+    annotated = true;
+  }
+
+  void write_annotations(std::ostream& out) const {
+    annotated_commodity_t::write_annotations(out, price, date, tag);
+  }
+
   static void write_annotations(std::ostream&      out,
 				const amount_t&    price,
 				const std::time_t  date,
 				const std::string& tag);
-  static
-  std::string make_qualified_name(const commodity_t& comm,
-				  const amount_t& price,
-				  const std::time_t date,
-				  const std::string& tag);
+
+ private:
   static commodity_t * create(const commodity_t& comm,
 			      const amount_t&    price,
 			      const std::time_t  date,
 			      const std::string& tag,
-			      const std::string& entry_name = "");
-  static commodity_t * create(const std::string& symbol,
-			      const amount_t&    price,
-			      const std::time_t  date,
-			      const std::string& tag);
-  static commodity_t * create(const std::string& symbol,
-			      const std::string& price,
-			      const std::string& date,
-			      const std::string& tag);
+			      const std::string& mapping_key);
+
   static commodity_t * find_or_create(const commodity_t& comm,
 				      const amount_t&    price,
 				      const std::time_t  date,
 				      const std::string& tag);
 
-  explicit annotated_commodity_t() {
-    annotated = true;
-  }
-
-  void write_annotations(std::ostream& out) const {
-    annotated_commodity_t::write_annotations(out, price, date, tag);
-  }
+  friend class amount_t;
 };
 
 inline std::ostream& operator<<(std::ostream& out, const commodity_t& comm) {