Remove left over cruft :(