After code consolidation