Revert "tweak comment removal regex, needs testing & commented out presumably useless loop counter"

This reverts commit f3364cb771b3c50f1981aaf686bd9f1ca66e56bf.