Merge "Remove unused deps." into main