cleaning up some cruft.