Remove unused deps, plusplus, update force push