Further cleanups on QA