remove dead code
generic dispatcher
cleanup
Merge pull request #1 from iirvine/generic-dispatcher

Generic dispatcher