Remove some obsolete defines

Change-Id: I6b62a824787cba47f3d3004f09ed684275c95995