Added minor stub of samples and more conf cleanup.