More cleanup of vendored modules I don't really use