Move unshared code out of Util.
Merge pull request #738 from square/jwilson_0420_kill_utility_code

Move unshared code out of Util.