Rework delete join