APU cleanup, using inheritance