Update remaining bits, remove NP2 Bronco for now