Issue #1617: removed deprecated things