Added more to the message that needs to be removed.

Change-Id: Ied5ea6cc2edd4c344fd44d9afe28b0cc42f16be5