Remove redundant code
Remove more redundant code