more cleanup woo