[MOD] Remove unwanted code

Merged Jose Luis Zanotti requested to merge DPI509 into 12.0-stage

Merge request reports