Minor dependencies cleanup