Cleanup a few things