Uninstaller fix.
Minor refactoring to Matrix:

- Added forwards to methods where identical code was copy-pasted
- Removed unnecessary f's
Reverted changes that forwarded methods with ref parameters.
Fixed bug caused by failed revert.
Merge pull request #2067 from l3m/minor-matrix-refac

Minor refactoring to Matrix:
Merge pull request #2066 from Shqrdx/TemplateFix2

Uninstaller fix.
Merge remote-tracking branch 'MG/develop' into develop