Sync with cryptech repo and cleanup.