Removed all the cruft