removed legacy code from evapi