Remove unused macros

Change-Id: Id76b285d70acb4de3ab27dbf2f0f0bb4b46735c7