Use new config 'cleaner', should solve issues in #59