Also remove all callback functions that would never get called
because of this.

Change-Id: I5dd5d64ccca9dd3d655428218957753d3200299e