Got rid of bad macros