Fix references, remove spurious