clean up a lot of stuff