abi: remove dead code

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Merge remote-tracking branch 'artagnon/abi-dead-code' into HEAD