diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index 9001a95578..0e5460fc52 100644
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -7,7 +7,9 @@
 
 	* math_funcliminset.[Ch]: dedicated new inset for \lim, \max, \min...
 	
-	* math_diminset.h: make cahce variables mutable
+	* math_diminset.h: make cache variables mutable, remove const_cast
+
+	* formulabase.[Ch]: remove unneeded convertFont()
 
 2001-08-01  André Pönitz  <poenitz@gmx.net>
 
diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C
index 5cba2ecf43..b70923dec0 100644
--- a/src/mathed/formulabase.C
+++ b/src/mathed/formulabase.C
@@ -890,24 +890,6 @@ Inset::Code InsetFormulaBase::lyxCode() const
 }
 
 
-#if 0
-LyXFont const InsetFormulaBase::convertFont(LyXFont const & f) const
-{
-#warning Andre, you should be able to remove this now?
-	// or change it to
-#if 1
-	return f;
-#else
-	// (Lgb)
-	
-	// We have already discussed what was here
-	LyXFont font(f);
-	return font;
-#endif
-}
-#endif
-
-
 void mathDispatchCreation(BufferView * bv, string const & arg, bool display)
 {
 	if (bv->available()) {
diff --git a/src/mathed/formulabase.h b/src/mathed/formulabase.h
index a433d723bd..cd80d0e92d 100644
--- a/src/mathed/formulabase.h
+++ b/src/mathed/formulabase.h
@@ -82,10 +82,6 @@ public:
 	virtual Inset * clone(Buffer const &, bool same_id = false) const = 0;
 	///
 	virtual Inset::Code lyxCode() const;
-#if 0
-	///
-	virtual LyXFont const convertFont(LyXFont const & f) const;
-#endif
 	/// what appears in the minibuffer when opening
 	virtual string const editMessage() const;
 	///