Merge "Clean up: delete unused methods"