Merge "Remove unused methods."