Revert "comment out code using named funs; revert when compiling with r17"

This reverts commit 39ab8f8d392af062fb80c319376bcb5fa410d889.
remove accidental non-breaking spaces
remove unused code