Little bit of LB cleanup
Temporarily disable LB support

Until it's finished