Removed debug expansion