(APU) Cleanups