remove if condition