Remove crypto, fix bugs, fine tune.