Remove unused MacroOrganizer

Change-Id: I637e84ae7fa82f687eb3f05b3e24e236f0ba8e3c