Issue #3340115: Remove unwanted codes and replace relevant classes

Merge request reports

Loading