Merge change Ie46db339 into eclair-mr2

* changes:
  Remove "unused" opcodes from API.