Removed commeneted out code
Merge branch 'mbst-9986-scrubbables' into stage