Clean dependencies

(cherry picked from commit de2549c)