Clean up.

- Updated dependencies.
- Clean up from kibit and bikeshed.
Merge remote-tracking branch 'origin/master'