Clean l1 config

same as #6802 for ROOT6 branch