Clean up lookup dispatch