cleanup preparation for Dec, 22