Fix a bug
Remove unnecessary code