cleanup/refactoring due to changes in evapi and evapplication