[API] legacy code removed