Delete unnecessary defines

Change-Id: Iae3fdd57725ead46acd3486adc02fd1164b36c17