[FUEL-813] Remove unused config options, fix code using review notes