ECL-274 cleaning up