clean up code related to dispatch table initialization
5 files changed