fixed message removal