cleanup of flakey qa_models.py