remove database calls for EY test