[SQUASH ME] Remove random macros