Remove antipattern storing storage and modernize constructor

Closes #3559366

Merge request reports

Loading