Get rid of useless comment
Remove redundant code