use NOPMDCAdapter, clean up code
4 files changed