More dependency usage cleanup