Remove build system cruft

Both these things were transitionary until bot upgrades.