Revert "fix demo, cost, dmv"

This reverts commit ac203fece1a49f5c0886fb08c9a288eb0f35339a.