(GOOD, BAD): Delete macros. Throughout,