removing if condition