* output is now only ever set in one place, so clean up that variable set