Significant cleanup due to both business and technical logic simplification