Remove redundant code and use existing functions

Merge request reports

Loading