Some cleanups for unnecessary macros Remove some macros that are no longer necessary for experimentation. Change-Id: I959bf441c8333607df4aa1ee18841f189ade8112