Cleaned up input_output. Needs testing
Cleaned up input_output. Needs testing


Former-commit-id: 3cb0188036d0cc113c0d0f4691daac407542e0f0
Former-commit-id: d3ee866b08ed02c7930ddea4d5453102f1e6f32a
urinieto/msaf,urinieto/msaf