XD-353, XD-691, XD-703: Cleanup runtime configuration