Cleanup/3.x/jointest cleanup