Continue removing every reference to etch

Etch will not be a dependency anymore