Cleanup, including making sample configuration files more generic.