- More paper config cleanup (#9938)