Large commit, getting rid of String as much as possible.
Dependencies cleanup.