Remove redundant code per review