Cleanup: Move locals to router