Remove references to 'APD'