ALM-575 removed legacy code from v2 API