added remove method and avoid remove on message handling