Remove joining logic