Drop even more legacy code