Updating to rust master
Cleanup