removed all the old cruft