cleaning code after delete message bug fix.