Track Rust master + cleanup