cleaning up a lot of stuff