I realy think these should be virtual

Change-Id: Ie95ab47d0252d21391e51116ca5e2c424fba1b59
callcatcher: update unused code

Change-Id: If3ef0f2134a15960fa1a14da0bec13cbd6019049