Fix matching regex on removing messages