Remove commented code that relates to MODULES-171