use NOPMDCAdapter, clean up code