Finish removing all remnants of snippets enhancement and cleanup branding