Merge "Remove references to non-existant directories"