fixed removing messages