Remove old if statement