QA mode cleanup