Remove unnecessary code
Remove unnecessary code