remove old dispatch system to use regex