OP-1627 ts fix, remove obsolete