Remove workaround.
Update Device::CurrentCost version.
Release prep.