Upgrade libraries.
Remove unused services.
Add UTF-8 test data goodness.