cleaned up some of the linking dependency graph #869