QAART-265 minor cleanup