Cleanup header lookup