Merge "Remove unused methods"