work in progress: clean up DPS abuse