Got rid of some cruft.