Remove unused options hash.
Refactor valuation.