feature[ats_ATS140406]: Clean up logging