Rm unused deps, add new ones