EAGLESIX-2651: Compare: rm unused vars