FUJI: config updates/cleanup