cleanup, switching to octobinder for reals