Merge "Remove usage info"