use new matcher on commands; remove old matcher