Merge "remove unused methods"