Remove unused dispatcher references

Thanks @efatsi