A bit more cleanup of dependencies
Merge pull request #368 from mposolda/master

A bit more cleanup of dependencies