Removed enhanced solo usages in the espresso backend