remove stupid condition