More IP fixes and remove LB support temporarily
Restore LBs in develop