Remove redundant codes
Remove redundant code