Code cleanup for caregiver.