Merge "Remove unused function: usage()"