Done rewiring to optimized bridges

There's an error for 2.10 unfortunately :(