Review Request 47: Remove extra messages during sync