Remove vestigial bits I forgot to axe