Some additional message index clean-up

Signed-off-by: Hristo- <Hristo-@users.noreply.github.com>