Merge "Remove references to now-empty expectation files."