Remove now useless code & Update deps.