more kernel configuration cleanup