Ripped out HotTowel because we don't need it any more

General tidy up and trim