More APU cleanup.