Completed consolidation and re-testing of the preprocessing section

Started with aa2968edcf85c623188d9309f53d3a6e3fcfe39c