qa: cleanups