Got rid of a few unnecessary macros