Fix array index
Remove relics from main flow support attempt
Fix array index and main flow support relices for IPv6