remove deprecated code as expected for 1.5
12 files changed