Merge "Some cleanups for unnecessary macros" into nextgenv2