Fixed quality issues and excluded unwanted transitive dependencies