Remove unnecessary macros

Change-Id: Id0975947b4e7b76b2c2464905f3b9a29245946c2
1 file changed