Update vendored modules, delete unused

Closes #1090