some more cleanup (but not thanks to the program this time)