Fix the test case, remove unused code
Remove unused code
Clean code
Clean code