And even more cleanup