clean up some dependency-related stuff found while working on Nexus