mac_g4 16.0 cleanup