Remove unused, commented-out code

Not needed since @d833054