Features/#762 too many deprecation warnings

Features/#762 too many deprecation warnings #1195