remove that if condition