Lots of cleanups and doing full crypto again