Also clean up v6 snippets