Remove logic from output module.