Still more cleanup