removed references to master-conf