try deletign from streams, add TODO