Merge "Remove unused wrapper methods"