Merge branch 'delete-crio-code' to avoid trying to use broken things