CAROLINE-18: remove build cycled dependencies.
Merge pull request #96 from it-workshop/wp/CAROLINE-18/2

CAROLINE-18: remove build cycled dependencies.