Clean up FreeJoint.cpp