[#79750556] Mostly simplications
Merge pull request #35 from oldfartdeveloper/79750556-branches

[#79750556] Mostly simplications