Got rid of all the old cruft