Merge "Remove unused rename code"