Merge "Remove unused method"