removing unused snippets
more tweaks