More simplification

Closed sigmaSd requested to merge sigmaSd:patch-2 into rust_port

Merge request reports