Clinic.h/cpp clean.