Remove intrusive dependencies introduced with copy-paste.
Merge branch 'develop'