Merge "Remove reference to deleted file"