Removing all the cruft and starting basically fresh