removed incorrect printing macros