Clean up config.pp, less modifications