would it be possible to remove from `substreamInputs` Map here, or is that done somewhere else?