More code cleaning after Eagle...