Remove topic.properties and incorporate into overall config file