cleanup config and remove debug log msgs