cleanup master/slave code; added placeholder to the default config