Resolve "Speed up the `clean_up_reference` function"

Merged Danijel Schorlemmer requested to merge 46-speed-up-the-clean_up_reference-function into master
Edited by Danijel Schorlemmer

Merge request reports