Removed not needed libs
Merge branch 'issue-536' into issue-533
Fix dependencies chain
Merge branch 'issue-533' into issue-534