DF-5503 minor clean-up;