Cleaning up dpnmq models