removing unnecessary messages from message handler