Remove unnecessary macros

Change-Id: I1d7cdea37db59f58ca100489e593b882a951d96a