finished legacy testing cleanup