Topic/remove dependency

Backport some dependency patches from hydro to fuerte