merging of r2a03 and apu is complete, should be no more references to apu in the code anywhere.