fix binary ordering / remove dead code / simplify public api