Merge "Remove references to non-existent directories"