update some dependencies, do some cleanup, and fix some mistakes in the cleanup and dependency update