remove joint/separable out of master branch