did same for PPC (nw)
Removed some not used macros (nw)