Remove unused config options, fix enableBackpackResupply option
Cleanup TODOs