Add should snippet
Update bundles
Kill dead code