- Removed some eco logic