Remove some unused macros

Change-Id: Ic8395cc31845e510b6ef5fb2a1d5f66534295012