More cleanup following the apt.buildd.debian.org removal