Bridging tweak (negotiation probably shouldnt be here @temas)
Removed a bunch of testing code