QA cleanup.