Fix sample config files and some clean-up