Cleanup of dependency resolver