remove cacerts to pull from upstream
remove gdbm to pull from upstream
remove a bunch of cruft to pull from the upstream