remove more unneeded PP stuff.