[OE-3941] Config sample and clean up