Drop even more now unused stuff.