Revert "Start to refactor whole commands matching"
Revert "Start to refactor whole commands matching"

This reverts commit 9a02d4ddc00e48b7f8730539aa2245657c42ac52.
The revert is done as it introduces regression issues.

sclorg/spec2scl,mbooth101/spec2scl