remove a bunch of unneeded defines

Change-Id: I02e99812b7a6afba04afee1b5c810bf5b1640c51