cleaning up qa code.
cleaning up QA code.