snippets cleanup