cleanup, more on QA test