clean up
eval: get rid of streams on some of the signatures