Tidy up and fix old update