Remove deprecations from functional interfaces
8 files changed