remved set-get values from stream to avoid async issues