Merge PR #6230: Quadcommand remove unneeded codes

Merge PR #6230