rm snippets
more tuning