(ADP) Drop/add ends ADP2 classes