removed none optimization