Clean out crypto + DB stuff don't need right now