Merge "Remove reference to directory that doesn't exist"