Deleting locally-unused things. They are now in the SPX repository.