Remove redundant code
Remove redundant code