Clean up a lot of stuff