Technical Debt - Removing 'cfse' references.