Refactoring and remove UI stress test.