removed some cruft.