massive reduction in redundancy and clean up