Qa settings cleanup