cleaning up lots of stuff