more cleanup, done yet?