remove if statement