Clean up some deprecated text macros