Cleanup input reuse

There were still some remnants of input reuse, including some comments as well some real functionality. I removed them.