more cleanup, several files