yet even more cleanup