Merge "Clean up unused native methods"