Remove bits that are superseded by Docker upstream