First pass complete of simplifying logic across resources