and even more cleanup