Topic/remove dependency

Backport some patches regarding dependency to fuerte