Dependency analysis cleanup