Some cleanings in dependencies