Remove extra if statement