Updated and tested different join methods

Cleaned up a bunch of unneeded code since we went to using *surface,
*tie, *rigid body.