Merge "Remove wrong usage documentation in comments"