Remove buggy & complicated join & part mechanism.