Remove old dispatch method
Unified parsing and dispatching code (still ugly)
Clean up parsing module further