remove unused deps, fix clone warnings