lots of random cleanup