Cleaning up the joints