Removing some deprecated callbacks

Change-Id: I3361383fe19faa64d862bbf879edb8c09937dc6f
4 files changed