figure macros removed