Remove unneeded join calls