Remove remaining cruft after adding rest of grettke's stuff