remove some stupid logic