remove cruft to support broken ycp bindings