Remove snap dependency

A couple of changesets