Bring back vendors; Scrap conquest cap

Debatable, the system with 1800/2200 weps and rating req was nice and gave a good carrot.