Fix unnecessary code
Fix unnecessary code