removed all the cruft