Enforce dependency checks

Also eliminate some unwanted transitive dependencies