got rid of some cruft