cleanup old defines

Change-Id: I5dd2827fa7a960aa8c7ddd1ad85f665a72ab6e8e