Removed some cruft.