Remove dead code now that we require the bootstrapping compiler be >= 6.12