Revert to a clean master

[azagniotov]

Reverting three (3) last PRs:

• 465

• 464

• 463

[codecov-commenter]

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Comparison is base (6f09ed9) 96.94% compared to head (51827c5) 96.94%.

:exclamation: Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files

```diff @@ Coverage Diff @@ ## master #467 +/- ## ========================================= Coverage 96.94% 96.94% Complexity 820 820 ========================================= Files 65 65 Lines 2681 2681 Branches 279 279 ========================================= Hits 2599 2599 Misses 49 49 Partials 33 33 ```