Re #7240 Remove unused code
Re #7240 remove unused code
Merge branch 'feature/7240_cleanup_refm' into develop