Remove debugging aid and left over cruft.