there's no need to retain the CAD and no need for locking hubs. Jeep eventually did away with both things. you can do a bypass of the CAD (quick and free, search the link in my signature) or you can remove the shafts and swap in later years' shafts that have bigger Ujoints and a one-piece shaft on the pass side.