Remove unused dependencies
Remove unneded dependencies and adjust metrics