more, more cleanup