Fix messages not getting removed