Revert "let empty unit be wildcard"

This reverts commit c1d6907ef37b299900ef136bbbdecfb0de1009ca.
Revert "clear redundant tokens"

This reverts commit 2bf3f55c4103e56e0aafcc1e061b93e0351fdf41.