More useless configuration cleanup/ordering