ppd many-to-many: clean up based on review comments