Remove unnecessary code
Remove unnecessary code
Update tester