cleaning up a bunch of stuff