DF-5312 minor clean-up;