Code cleanup
Removed old ess mappings
Added errback and code cleanup