Remove dead bridging code from features