Wrappers omit txt output, only allow html output: code cleanup