Remove "true"/"false" check