Removing some obsolete callbacks

Change-Id: I3cf19a13ff145923f2973e23c24033f196324aa3
5 files changed