Remove this in practice as well as spirit.