move crypt commands into rivet, so remove custom ones