Bit more cleanup. Removed new UI code, to do another day.