Remove a needless assertion
Remove an API option

TODO: examine a different method