Remove I/O-redirected no-ops
Fix a comment and remove unused variables