again, more cleanup