Remove transitive dependency handling
Fixes #140
Fixes #141