Removes dispatcher

Removes dispatcher and directly calls the function on the router