Remove constants not needed since 1661063e