Cleanup & rust syncup