removed the cruft