Clean up dependencies handling
Merge pull request #1983 from excilys/dependencies-cleanup

Clean up dependencies handling