Remove old ABI code