Dayton drops 'surcharge' on rich plan as deficit shrinks