QAART-265 cleanUp