Cleanup deps2

Failed to rebase from cleanup-deps.
Cherry-picking instead