Remove deprecated API
Merge branch 'dudko'