Remove some dispatch