reformat files, remove "om" since we have ec available in superclass,
and remove method that gets ObjectProvider (use directly)