Keep things up-to-date
more cleanup